Loading .gitlab-ci.yml +3 −6 Original line number Diff line number Diff line Loading @@ -20,9 +20,8 @@ build_slim: - generic_privileged script: - docker pull $CI_REGISTRY_IMAGE:slim-latest || true - docker build --cache-from $CI_REGISTRY_IMAGE:slim-latest -t $CI_REGISTRY_IMAGE:slim-$CI_COMMIT_REF_NAME -t $CI_REGISTRY_IMAGE:slim-$CI_COMMIT_SHA -f Dockerfile.slim . - docker build --cache-from $CI_REGISTRY_IMAGE:slim-latest -t $CI_REGISTRY_IMAGE:slim-$CI_COMMIT_REF_NAME -f Dockerfile.slim . - docker push $CI_REGISTRY_IMAGE:slim-$CI_COMMIT_REF_NAME - docker push $CI_REGISTRY_IMAGE:slim-$CI_COMMIT_SHA - | if [ "$CI_COMMIT_REF_NAME" = "master" ]; then docker tag $CI_REGISTRY_IMAGE:slim-master $CI_REGISTRY_IMAGE:slim-latest; Loading @@ -35,9 +34,8 @@ build_full: - generic_privileged script: - docker pull $CI_REGISTRY_IMAGE:latest || true - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA -f Dockerfile . - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME -f Dockerfile . - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - | if [ "$CI_COMMIT_REF_NAME" = "master" ]; then docker tag $CI_REGISTRY_IMAGE:master $CI_REGISTRY_IMAGE:latest; Loading @@ -50,9 +48,8 @@ build_chromium: - generic_privileged script: - docker pull $CI_REGISTRY_IMAGE:chromium-latest || true - docker build --cache-from $CI_REGISTRY_IMAGE:chromium-latest -t $CI_REGISTRY_IMAGE:chromium-$CI_COMMIT_REF_NAME -t $CI_REGISTRY_IMAGE:chromium-$CI_COMMIT_SHA -f Dockerfile.chromium . - docker build --cache-from $CI_REGISTRY_IMAGE:chromium-latest -t $CI_REGISTRY_IMAGE:chromium-$CI_COMMIT_REF_NAME -f Dockerfile.chromium . - docker push $CI_REGISTRY_IMAGE:chromium-$CI_COMMIT_REF_NAME - docker push $CI_REGISTRY_IMAGE:chromium-$CI_COMMIT_SHA - | if [ "$CI_COMMIT_REF_NAME" = "master" ]; then docker tag $CI_REGISTRY_IMAGE:chromium-master $CI_REGISTRY_IMAGE:chromium-latest; Loading Loading
.gitlab-ci.yml +3 −6 Original line number Diff line number Diff line Loading @@ -20,9 +20,8 @@ build_slim: - generic_privileged script: - docker pull $CI_REGISTRY_IMAGE:slim-latest || true - docker build --cache-from $CI_REGISTRY_IMAGE:slim-latest -t $CI_REGISTRY_IMAGE:slim-$CI_COMMIT_REF_NAME -t $CI_REGISTRY_IMAGE:slim-$CI_COMMIT_SHA -f Dockerfile.slim . - docker build --cache-from $CI_REGISTRY_IMAGE:slim-latest -t $CI_REGISTRY_IMAGE:slim-$CI_COMMIT_REF_NAME -f Dockerfile.slim . - docker push $CI_REGISTRY_IMAGE:slim-$CI_COMMIT_REF_NAME - docker push $CI_REGISTRY_IMAGE:slim-$CI_COMMIT_SHA - | if [ "$CI_COMMIT_REF_NAME" = "master" ]; then docker tag $CI_REGISTRY_IMAGE:slim-master $CI_REGISTRY_IMAGE:slim-latest; Loading @@ -35,9 +34,8 @@ build_full: - generic_privileged script: - docker pull $CI_REGISTRY_IMAGE:latest || true - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA -f Dockerfile . - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME -f Dockerfile . - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - | if [ "$CI_COMMIT_REF_NAME" = "master" ]; then docker tag $CI_REGISTRY_IMAGE:master $CI_REGISTRY_IMAGE:latest; Loading @@ -50,9 +48,8 @@ build_chromium: - generic_privileged script: - docker pull $CI_REGISTRY_IMAGE:chromium-latest || true - docker build --cache-from $CI_REGISTRY_IMAGE:chromium-latest -t $CI_REGISTRY_IMAGE:chromium-$CI_COMMIT_REF_NAME -t $CI_REGISTRY_IMAGE:chromium-$CI_COMMIT_SHA -f Dockerfile.chromium . - docker build --cache-from $CI_REGISTRY_IMAGE:chromium-latest -t $CI_REGISTRY_IMAGE:chromium-$CI_COMMIT_REF_NAME -f Dockerfile.chromium . - docker push $CI_REGISTRY_IMAGE:chromium-$CI_COMMIT_REF_NAME - docker push $CI_REGISTRY_IMAGE:chromium-$CI_COMMIT_SHA - | if [ "$CI_COMMIT_REF_NAME" = "master" ]; then docker tag $CI_REGISTRY_IMAGE:chromium-master $CI_REGISTRY_IMAGE:chromium-latest; Loading