diff options
| author | Sarah German <sgerman@gitlab.com> | 2023-08-02 18:31:02 +0300 |
|---|---|---|
| committer | Sarah German <sgerman@gitlab.com> | 2023-08-02 18:31:02 +0300 |
| commit | 0a1a6e256ddaec6721ca5ce8a3d2f0cd0ef8e03a (patch) | |
| tree | bbac1fa95273a8fc59e6cfb9c58f00680b8e037f | |
| parent | 1e4b3e2490ec29a7754e00128629590c7087260c (diff) | |
| parent | 2917afbbb016b18d9edcde43982eaa3f86ce5739 (diff) | |
Merge branch 'update-workspace-pipeline-config' into 'main'
Update pipeline config for workspace image
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/4134
Merged-by: Sarah German <sgerman@gitlab.com>
Approved-by: Sarah German <sgerman@gitlab.com>
Co-authored-by: Marcel Amirault <mamirault@gitlab.com>
| -rw-r--r-- | .gitlab/ci/docker-images.gitlab-ci.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitlab/ci/docker-images.gitlab-ci.yml b/.gitlab/ci/docker-images.gitlab-ci.yml index 594f28a7..5b04862e 100644 --- a/.gitlab/ci/docker-images.gitlab-ci.yml +++ b/.gitlab/ci/docker-images.gitlab-ci.yml @@ -332,7 +332,6 @@ image:docs-workspace: variables: IMAGE_NAME: $CI_REGISTRY_IMAGE/workspace DOCKERFILE: dockerfiles/gitlab-docs-workspace.Dockerfile - needs: [] script: - docker build --build-arg ASDF_VERSION=${ASDF_VERSION} -t $IMAGE_NAME -f $DOCKERFILE . - docker push $IMAGE_NAME @@ -343,7 +342,6 @@ image:docs-workspace: test:image:docs-workspace: extends: - .docker_prepare - - .rules_docker_image_tests stage: test variables: IMAGE_NAME: $CI_REGISTRY_IMAGE/workspace @@ -352,6 +350,7 @@ test:image:docs-workspace: script: - docker build --build-arg ASDF_VERSION=${ASDF_VERSION} -t $IMAGE_NAME -f $DOCKERFILE . rules: + - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Build docker images pipeline"' - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/' # This image uses asdf to manage dependencies, so run this test if tool versions change. changes: |