diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2023-06-26 10:51:47 +0300 |
|---|---|---|
| committer | Marcel Amirault <mamirault@gitlab.com> | 2023-06-26 10:51:47 +0300 |
| commit | 60aa3bc65362cc02279337b1bf74bdc50a620a3c (patch) | |
| tree | f41b75f03050c307daef8d4bb80ce08d2ca57a44 | |
| parent | 0d8d28a3f13780e71547250510198c6f134fb71b (diff) | |
| parent | e149cc7aa1bfd86f997c89242b96006d954fb99d (diff) | |
Merge branch 'axil-no-compress' into 'main'fneill-remove-examples-page-from-nav
Do not compress images when creating Docker stable images
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3990
Merged-by: Marcel Amirault <mamirault@gitlab.com>
Approved-by: Marcel Amirault <mamirault@gitlab.com>
Co-authored-by: Achilleas Pipinellis <axil@gitlab.com>
| -rw-r--r-- | .gitlab/ci/docker-images.gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | dockerfiles/single.Dockerfile | 7 |
2 files changed, 3 insertions, 11 deletions
diff --git a/.gitlab/ci/docker-images.gitlab-ci.yml b/.gitlab/ci/docker-images.gitlab-ci.yml index 26ea1325..61c546b8 100644 --- a/.gitlab/ci/docker-images.gitlab-ci.yml +++ b/.gitlab/ci/docker-images.gitlab-ci.yml @@ -188,9 +188,6 @@ test:image:docs-single: NANOC_ENV: test needs: [] 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} @@ -244,9 +241,7 @@ test:image:docs-single-lunrjs: NANOC_ENV: test needs: [] script: - - apk add --no-cache -U make bash git - - git fetch --all - - git checkout -b $GITLAB_VERSION origin/$GITLAB_VERSION + - apk add make bash - docker build --build-arg NANOC_ENV=${NANOC_ENV} --build-arg VER=${GITLAB_VERSION} diff --git a/dockerfiles/single.Dockerfile b/dockerfiles/single.Dockerfile index 4e1156db..0ba7878a 100644 --- a/dockerfiles/single.Dockerfile +++ b/dockerfiles/single.Dockerfile @@ -34,7 +34,6 @@ RUN apk add --no-cache -U \ minify \ nodejs \ openssl \ - pngquant \ ruby-dev \ tar \ xz \ @@ -66,11 +65,9 @@ RUN if [ "$SEARCH_BACKEND" = "lunr" ]; then make build-lunr-index; fi # Run post-processing on archive: # # 1. Normalize the links in /source/public using version $VER. -# 2. Compress images in /source/public. -# 3. Minify the files in /source/public into /dest, creating /dest/public. Must run last. -# 4. Rename /dest/public to /dest/$VER +# 2. Minify the files in /source/public into /dest, creating /dest/public. Must run last. +# 3. Rename /dest/public to /dest/$VER RUN /source/scripts/normalize-links.sh /source/public $VER \ - && /source/scripts/compress_images.sh /source/public \ && mkdir /dest \ && /source/scripts/minify-assets.sh /dest /source/public \ && mv /dest/public "/dest/${VER}" |