diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2023-02-06 13:48:13 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2023-02-15 15:42:40 +0300 |
| commit | bd682fd949d383f6c685aa675460b23a7c5725ab (patch) | |
| tree | f9eeb7bf7c23d2a10aafcccae306379be1b16f70 | |
| parent | 736e7bf025cfdd79bbac4b2e1f3cab652d185e48 (diff) | |
Apply the MR changes in the single Dockerfile testsaxil-apply-mr-patch-single-docker
| -rw-r--r-- | .gitlab/ci/docker-images.gitlab-ci.yml | 18 | ||||
| -rw-r--r-- | dockerfiles/single.Dockerfile | 2 |
2 files changed, 14 insertions, 6 deletions
diff --git a/.gitlab/ci/docker-images.gitlab-ci.yml b/.gitlab/ci/docker-images.gitlab-ci.yml index 7058e09b..13b672a5 100644 --- a/.gitlab/ci/docker-images.gitlab-ci.yml +++ b/.gitlab/ci/docker-images.gitlab-ci.yml @@ -195,9 +195,13 @@ test:image:docs-single: changes: - $DOCKERFILE script: - - apk add --no-cache -U git + # Make sure to build the stable version + - apk add --no-cache -U git curl - git fetch --all - - git checkout -b $GITLAB_VERSION origin/$GITLAB_VERSION + - git checkout -B $GITLAB_VERSION origin/$GITLAB_VERSION + # We need to test for any changes a merge request introduces in single.Dockerfile. + # Get the Dockerfile of the merge request and build against that. + - curl --output $DOCKERFILE "https://gitlab.com/$CI_PROJECT_PATH/-/raw/$CI_COMMIT_SHA/$DOCKERFILE" - docker build --build-arg NANOC_ENV=${NANOC_ENV} --build-arg VER=${GITLAB_VERSION} @@ -242,7 +246,7 @@ test:image:docs-single-lunrjs: - .docker_prepare stage: test variables: - GITLAB_VERSION: '15.6' + GITLAB_VERSION: '15.8' IMAGE_NAME: $CI_REGISTRY_IMAGE/archives:$GITLAB_VERSION DOCKERFILE: dockerfiles/single.Dockerfile NANOC_ENV: test @@ -252,9 +256,13 @@ test:image:docs-single-lunrjs: changes: - $DOCKERFILE script: - - apk add --no-cache -U make bash git + # Make sure to build the stable version + - apk add --no-cache -U make bash git curl - git fetch --all - - git checkout -b $GITLAB_VERSION origin/$GITLAB_VERSION + - git checkout -B $GITLAB_VERSION origin/$GITLAB_VERSION + # We need to test for any changes a merge request introduces in single.Dockerfile. + # Get the Dockerfile of the merge request and build against that. + - curl --output $DOCKERFILE "https://gitlab.com/$CI_PROJECT_PATH/-/raw/$CI_COMMIT_SHA/$DOCKERFILE" # We can drop the ALGOLIA_SEARCH arg once we target a GITLAB_VERSION >= 15.9. # See https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3477#note_1251563455 - docker build diff --git a/dockerfiles/single.Dockerfile b/dockerfiles/single.Dockerfile index bf3c55bf..0364e4dd 100644 --- a/dockerfiles/single.Dockerfile +++ b/dockerfiles/single.Dockerfile @@ -37,7 +37,7 @@ ENV NANOC_ENV=$NANOC_ENV # Install Nanoc dependencies and tools that # are needed to build the docs site and run the tests. # -RUN apk add --no-cache -U \ +RUN apk add --no-cache -U \ bash \ build-base \ curl \ |