Loading jobs/docker_build/docker_build.yml +6 −4 Original line number Diff line number Diff line Loading @@ -14,24 +14,26 @@ docker_build: - mkdir -p /kaniko/.docker/ - if [ ! -z ${CUSTOM_REGISTRY} ]; then - echo "{\"auths\":{\"$CUSTOM_REGISTRY\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - REGISTRY_IMAGE=$CUSTOM_REGISTRY/$CI_PROJECT_PATH - else - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - REGISTRY_IMAGE=$CI_REGISTRY/$CI_PROJECT_PATH - fi - if [ ! -z ${CI_COMMIT_TAG} ]; then - IMAGE_TAG=${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG} - if [ ${TAG_CREATE_LATEST} == "true" ]; then - OPTIONAL_TAG="--destination ${CI_REGISTRY_IMAGE}:latest" - OPTIONAL_TAG="--destination ${REGISTRY_IMAGE}:latest" - fi - else - IMAGE_TAG=${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} - if [ ${COMMIT_CREATE_LATEST} == "true" ]; then - OPTIONAL_TAG="--destination ${CI_REGISTRY_IMAGE}:latest" - OPTIONAL_TAG="--destination ${REGISTRY_IMAGE}:latest" - fi - fi - if [ ! -z ${CUSTOM_TAG} ]; then - /kaniko/executor --context ${CI_PROJECT_DIR} --dockerfile ${CI_PROJECT_DIR}/Dockerfile --destination ${CUSTOM_TAG} - /kaniko/executor --context ${CI_PROJECT_DIR} --dockerfile ${CI_PROJECT_DIR}/Dockerfile --destination ${REGISTRY_IMAGE}:${CUSTOM_TAG} - else - /kaniko/executor --context ${CI_PROJECT_DIR} --dockerfile ${CI_PROJECT_DIR}/Dockerfile --destination ${IMAGE_TAG} ${OPTIONAL_TAG} - /kaniko/executor --context ${CI_PROJECT_DIR} --dockerfile ${CI_PROJECT_DIR}/Dockerfile --destination ${REGISTRY_IMAGE}:${IMAGE_TAG} ${OPTIONAL_TAG} - fi jobs/trivy_image/trivy_image.yml +5 −3 Original line number Diff line number Diff line Loading @@ -48,16 +48,18 @@ trivy: - if [ ! -z ${CUSTOM_REGISTRY} ]; then - docker login -u $REGISTRY_USER -p $REGISTRY_PASSWORD $CUSTOM_REGISTRY - REGISTRY_IMAGE=$CUSTOM_REGISTRY/$CI_PROJECT_PATH - else - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - REGISTRY_IMAGE=$CI_REGISTRY/$CI_PROJECT_PATH - fi - if [ ! -z ${CUSTOM_TAG} ]; then - ./trivy --template "@$TEMPLATE_NAME" -o $TRIVY_OUTPUT $CUSTOM_TAG - ./trivy --template "@$TEMPLATE_NAME" -o $TRIVY_OUTPUT $REGISTRY_IMAGE:$CUSTOM_TAG - elif [ ! -z ${CI_COMMIT_TAG} ]; then - ./trivy --template "@$TEMPLATE_NAME" -o $TRIVY_OUTPUT $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG - ./trivy --template "@$TEMPLATE_NAME" -o $TRIVY_OUTPUT $REGISTRY_IMAGE:$CI_COMMIT_TAG - else - ./trivy --template "@$TEMPLATE_NAME" -o $TRIVY_OUTPUT $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - ./trivy --template "@$TEMPLATE_NAME" -o $TRIVY_OUTPUT $REGISTRY_IMAGE:$CI_COMMIT_SHA - fi cache: Loading Loading
jobs/docker_build/docker_build.yml +6 −4 Original line number Diff line number Diff line Loading @@ -14,24 +14,26 @@ docker_build: - mkdir -p /kaniko/.docker/ - if [ ! -z ${CUSTOM_REGISTRY} ]; then - echo "{\"auths\":{\"$CUSTOM_REGISTRY\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - REGISTRY_IMAGE=$CUSTOM_REGISTRY/$CI_PROJECT_PATH - else - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - REGISTRY_IMAGE=$CI_REGISTRY/$CI_PROJECT_PATH - fi - if [ ! -z ${CI_COMMIT_TAG} ]; then - IMAGE_TAG=${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG} - if [ ${TAG_CREATE_LATEST} == "true" ]; then - OPTIONAL_TAG="--destination ${CI_REGISTRY_IMAGE}:latest" - OPTIONAL_TAG="--destination ${REGISTRY_IMAGE}:latest" - fi - else - IMAGE_TAG=${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} - if [ ${COMMIT_CREATE_LATEST} == "true" ]; then - OPTIONAL_TAG="--destination ${CI_REGISTRY_IMAGE}:latest" - OPTIONAL_TAG="--destination ${REGISTRY_IMAGE}:latest" - fi - fi - if [ ! -z ${CUSTOM_TAG} ]; then - /kaniko/executor --context ${CI_PROJECT_DIR} --dockerfile ${CI_PROJECT_DIR}/Dockerfile --destination ${CUSTOM_TAG} - /kaniko/executor --context ${CI_PROJECT_DIR} --dockerfile ${CI_PROJECT_DIR}/Dockerfile --destination ${REGISTRY_IMAGE}:${CUSTOM_TAG} - else - /kaniko/executor --context ${CI_PROJECT_DIR} --dockerfile ${CI_PROJECT_DIR}/Dockerfile --destination ${IMAGE_TAG} ${OPTIONAL_TAG} - /kaniko/executor --context ${CI_PROJECT_DIR} --dockerfile ${CI_PROJECT_DIR}/Dockerfile --destination ${REGISTRY_IMAGE}:${IMAGE_TAG} ${OPTIONAL_TAG} - fi
jobs/trivy_image/trivy_image.yml +5 −3 Original line number Diff line number Diff line Loading @@ -48,16 +48,18 @@ trivy: - if [ ! -z ${CUSTOM_REGISTRY} ]; then - docker login -u $REGISTRY_USER -p $REGISTRY_PASSWORD $CUSTOM_REGISTRY - REGISTRY_IMAGE=$CUSTOM_REGISTRY/$CI_PROJECT_PATH - else - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - REGISTRY_IMAGE=$CI_REGISTRY/$CI_PROJECT_PATH - fi - if [ ! -z ${CUSTOM_TAG} ]; then - ./trivy --template "@$TEMPLATE_NAME" -o $TRIVY_OUTPUT $CUSTOM_TAG - ./trivy --template "@$TEMPLATE_NAME" -o $TRIVY_OUTPUT $REGISTRY_IMAGE:$CUSTOM_TAG - elif [ ! -z ${CI_COMMIT_TAG} ]; then - ./trivy --template "@$TEMPLATE_NAME" -o $TRIVY_OUTPUT $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG - ./trivy --template "@$TEMPLATE_NAME" -o $TRIVY_OUTPUT $REGISTRY_IMAGE:$CI_COMMIT_TAG - else - ./trivy --template "@$TEMPLATE_NAME" -o $TRIVY_OUTPUT $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - ./trivy --template "@$TEMPLATE_NAME" -o $TRIVY_OUTPUT $REGISTRY_IMAGE:$CI_COMMIT_SHA - fi cache: Loading