diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac2985e165544061a3f1551f4912a5aa31367bb1..902856626c6064cf037bad1358681cdea3f28ce7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,18 +57,19 @@ build container image: entrypoint: [""] script: # use tag for version if not empty; else commit sha - - "[[ -n ${CI_COMMIT_TAG} ]] && export version=${CI_COMMIT_TAG} || export version=${CI_COMMIT_SHORT_SHA}" + - export CI_COMMIT_TAG=1.0.0 + - "test -n \"$CI_COMMIT_TAG\" && export version=$CI_COMMIT_TAG || export version=$CI_COMMIT_SHORT_SHA" - echo $version - - mkdir -p /kaniko/.docker - - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} | base64 | tr -d '\n')\"},\"$harbor_registry\":{\"auth\":\"$HARBOR_ROBOT_TOKEN64\"}}}" > /kaniko/.docker/config.json - - /kaniko/executor - --context $CI_PROJECT_DIR - --dockerfile $CI_PROJECT_DIR/Dockerfile - --build-arg build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ') - --build-arg vcs_ref=${CI_COMMIT_SHORT_SHA} - --build-arg version=${version} - --destination $CI_REGISTRY_IMAGE/$project_name:$version - --destination $harbor_registry/$harbor_repo/$project_name:$version + # - mkdir -p /kaniko/.docker + # - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} | base64 | tr -d '\n')\"},\"$harbor_registry\":{\"auth\":\"$HARBOR_ROBOT_TOKEN64\"}}}" > /kaniko/.docker/config.json + # - /kaniko/executor + # --context $CI_PROJECT_DIR + # --dockerfile $CI_PROJECT_DIR/Dockerfile + # --build-arg build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ') + # --build-arg vcs_ref=${CI_COMMIT_SHORT_SHA} + # --build-arg version=${version} + # --destination $CI_REGISTRY_IMAGE/$project_name:$version + # --destination $harbor_registry/$harbor_repo/$project_name:$version rules: # prevent job creation on release commits to $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE =~ /^chore\(release\):/