From a411ef6894c5468d4112325e9d2af6c6b23e2d9b Mon Sep 17 00:00:00 2001
From: jonasled <1-jonasled@users.noreply.gitlab.jonasled.de>
Date: Tue, 22 Jun 2021 20:31:59 +0000
Subject: [PATCH] update docker build and add php scheker for php
---
.gitlab-ci.yml | 33 ++++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b095bee..767e6d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,16 +4,35 @@ cache:
- node_modules/
- public/API/vendor/
-docker-build-master:
- # Official docker image.
+docker-build:
+ # Use the official docker image.
image: docker:latest
stage: build
services:
- docker:dind
before_script:
- - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" gitlab.jonasled.de
+ - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+ # Default branch leaves tag empty (= latest tag)
+ # All other branches are tagged with the escaped branch name (commit ref slug)
script:
- - docker build -t gitlab.jonasled.de/jonasled/website:latest .
- - docker push "gitlab.jonasled.de/jonasled/website:latest"
- only:
- - master
\ No newline at end of file
+ - |
+ if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
+ tag=""
+ echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
+ else
+ tag=":$CI_COMMIT_REF_SLUG"
+ echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
+ fi
+ - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
+ - docker push "$CI_REGISTRY_IMAGE${tag}"
+ # Run this job in a branch where a Dockerfile exists
+ rules:
+ - if: $CI_COMMIT_BRANCH
+ exists:
+ - Dockerfile
+
+php-security-checker:
+ stage: linting
+ image: registry.gitlab.com/pipeline-components/php-security-checker:latest
+ script:
+ - cd public/API && security-checker security:check composer.lock
--
GitLab