diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2022-06-13 11:14:38 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2022-06-13 11:14:38 +0300 |
| commit | 33228a8b2d27a6041b709341b47ea474b205cbd7 (patch) | |
| tree | 25b374c792451c6362ed64ab67d5b381264fa540 /dockerfiles | |
| parent | 2f4635e8096e48c3f9790ed59e2d5aca776b0c38 (diff) | |
Merge the base and bootstrap Dockerfiles
Diffstat (limited to 'dockerfiles')
| -rw-r--r-- | dockerfiles/bootstrap.Dockerfile | 2 | ||||
| -rw-r--r-- | dockerfiles/gitlab-docs-base.Dockerfile | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/dockerfiles/bootstrap.Dockerfile b/dockerfiles/bootstrap.Dockerfile index aba59541..42d26521 100644 --- a/dockerfiles/bootstrap.Dockerfile +++ b/dockerfiles/bootstrap.Dockerfile @@ -1,3 +1,5 @@ +# DEPRECATED: DO NOT UPDATE + # This is the Nanoc bootstrap Dockerfile which builds an image that contains # all Nanoc's runtime dependencies and gems. diff --git a/dockerfiles/gitlab-docs-base.Dockerfile b/dockerfiles/gitlab-docs-base.Dockerfile index c756a4a4..d9ea119d 100644 --- a/dockerfiles/gitlab-docs-base.Dockerfile +++ b/dockerfiles/gitlab-docs-base.Dockerfile @@ -1,4 +1,6 @@ +# # Base image for other Docker images +# Includes all system dependencies to build the GitLab Docs site # # RUBY_VERSION and ALPINE_VERSION are defined in ../.gitlab-ci.yml ARG RUBY_VERSION @@ -14,13 +16,13 @@ RUN printf "\n\e[32mINFO: Installing dependencies..\e[39m\n" && apk add --no-cac gcompat \ git \ gnupg \ - go \ grep \ gzip \ jq \ libcurl \ libxslt \ libxslt-dev \ + minify \ nodejs \ openssl \ pngquant \ |