Skip to content
Snippets Groups Projects

Resolve "fix empty version issue in CI"

Merged Stefan Hynek requested to merge 40-fix-empty-version-issue-in-ci into main
1 file
+ 16
10
Compare changes
  • Side-by-side
  • Inline
+ 16
10
@@ -59,16 +59,22 @@ build container image:
# 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}"
- 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
- "[[ -n $CI_COMMIT_TAG ]] && export version=$CI_COMMIT_TAG || export version=$CI_COMMIT_SHORT_SHA"
- echo $version
- "[[ -n $CI_COMMIT_TAG ]] && echo ja || echo nein"
- export tag=$CI_COMMIT_TAG
- "[[ -n $tag ]] && export version=$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
rules:
# prevent job creation on release commits to $CI_DEFAULT_BRANCH
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE =~ /^chore\(release\):/
Loading