diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2022-11-23 13:57:45 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2022-11-23 13:57:45 +0300 |
| commit | ffe5a25357bf484430025ac2cf7bb7ad13202b5b (patch) | |
| tree | 32865ca333d3a6cbc5ced772ac9aeb4caf128182 | |
| parent | df2068e74ff4036946da168e74ca77ac3aaa0ab5 (diff) | |
| parent | 6f196ae46a49c71f5f03836aed90155ed4ec2b22 (diff) | |
Merge branch 'sarahg/test-image-docs-single' into 'main'
Test the Docker build off the branch set in $GITLAB_VERSION
Closes #1284
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3289
Merged-by: Achilleas Pipinellis <axil@gitlab.com>
Approved-by: Achilleas Pipinellis <axil@gitlab.com>
Co-authored-by: Sarah German <sgerman@gitlab.com>
| -rw-r--r-- | .gitlab/ci/docker-images.gitlab-ci.yml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/.gitlab/ci/docker-images.gitlab-ci.yml b/.gitlab/ci/docker-images.gitlab-ci.yml index 1ac2969e..94f05b65 100644 --- a/.gitlab/ci/docker-images.gitlab-ci.yml +++ b/.gitlab/ci/docker-images.gitlab-ci.yml @@ -146,6 +146,9 @@ test:image:docs-single: changes: - $DOCKERFILE script: + - apk add --no-cache -U git + - git fetch -all + - git checkout -b $GITLAB_VERSION origin/$GITLAB_VERSION - docker build --build-arg NANOC_ENV=${NANOC_ENV} --build-arg VER=${GITLAB_VERSION} @@ -200,7 +203,9 @@ test:image:docs-single-lunrjs: changes: - $DOCKERFILE script: - - apk add --no-cache -U make bash + - apk add --no-cache -U make bash git + - git fetch -all + - git checkout -b $GITLAB_VERSION origin/$GITLAB_VERSION - docker build --build-arg NANOC_ENV=${NANOC_ENV} --build-arg VER=${GITLAB_VERSION} |