Loading .gitlab-ci.yml +5 −6 Original line number Diff line number Diff line Loading @@ -2,8 +2,8 @@ stages: - build variables: REVISION: "latest" DOCKER_DRIVER: overlay2 CONTAINER_IMAGE: registry.gitlab.e.foundation:5000/$CI_PROJECT_PATH build_image: stage: build Loading @@ -11,9 +11,8 @@ build_image: services: - docker:dind script: - docker pull $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME || true - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.e.foundation:5000 - docker build -t registry.gitlab.e.foundation:5000/e/os/docker-lineage-cicd . - docker push registry.gitlab.e.foundation:5000/e/os/docker-lineage-cicd:$REVISION only: - /^master$/ - web - docker build --cache-from $CONTAINER_IMAGE:latest -t $CONTAINER_IMAGE -t $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME . - docker push $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CONTAINER_IMAGE:latest ; fi Loading
.gitlab-ci.yml +5 −6 Original line number Diff line number Diff line Loading @@ -2,8 +2,8 @@ stages: - build variables: REVISION: "latest" DOCKER_DRIVER: overlay2 CONTAINER_IMAGE: registry.gitlab.e.foundation:5000/$CI_PROJECT_PATH build_image: stage: build Loading @@ -11,9 +11,8 @@ build_image: services: - docker:dind script: - docker pull $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME || true - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.e.foundation:5000 - docker build -t registry.gitlab.e.foundation:5000/e/os/docker-lineage-cicd . - docker push registry.gitlab.e.foundation:5000/e/os/docker-lineage-cicd:$REVISION only: - /^master$/ - web - docker build --cache-from $CONTAINER_IMAGE:latest -t $CONTAINER_IMAGE -t $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME . - docker push $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CONTAINER_IMAGE:latest ; fi