Loading .gitlab-ci.yml +5 −6 Original line number Diff line number Diff line Loading @@ -4,7 +4,6 @@ image: docker:19.03.1 # improved performance. variables: DOCKER_DRIVER: overlay2 CONTAINER_IMAGE: registry.gitlab.e.foundation:5000/e/os/lineageota PUBLISH_USER: root PUBLISH_URL: ota.ecloud.global DOCKER_TLS_CERTDIR: "/certs" Loading @@ -15,11 +14,11 @@ services: build: stage: build 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 --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 - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME . - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CI_REGISTRY_IMAGE:latest ; fi tags: - generic_privileged Loading Loading
.gitlab-ci.yml +5 −6 Original line number Diff line number Diff line Loading @@ -4,7 +4,6 @@ image: docker:19.03.1 # improved performance. variables: DOCKER_DRIVER: overlay2 CONTAINER_IMAGE: registry.gitlab.e.foundation:5000/e/os/lineageota PUBLISH_USER: root PUBLISH_URL: ota.ecloud.global DOCKER_TLS_CERTDIR: "/certs" Loading @@ -15,11 +14,11 @@ services: build: stage: build 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 --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 - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME . - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CI_REGISTRY_IMAGE:latest ; fi tags: - generic_privileged Loading