diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2022-11-22 16:44:03 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2022-11-22 22:28:56 +0300 |
commit | e2cacd81aa07c93f598f901639cecb2d6a30ffe7 (patch) | |
tree | d24ac9b7d1f3af37a5846710864583b3b1d5a8df /dockerfiles | |
parent | bb9a1f49c41e1e53f7e77e86b48693c3ef9b7f8e (diff) |
Clean up old Dockerfiles and their references
Diffstat (limited to 'dockerfiles')
-rw-r--r-- | dockerfiles/archives.Dockerfile | 52 | ||||
-rw-r--r-- | dockerfiles/bootstrap.Dockerfile | 35 | ||||
-rw-r--r-- | dockerfiles/builder.onbuild.Dockerfile | 36 | ||||
-rw-r--r-- | dockerfiles/gitlab-docs-base.Dockerfile | 41 | ||||
-rw-r--r-- | dockerfiles/nginx.onbuild.Dockerfile | 21 |
5 files changed, 0 insertions, 185 deletions
diff --git a/dockerfiles/archives.Dockerfile b/dockerfiles/archives.Dockerfile deleted file mode 100644 index d2e8eeb2..00000000 --- a/dockerfiles/archives.Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -FROM nginx:stable-alpine - -ENV TARGET=/usr/share/nginx/html - -# Get the nginx config from the nginx-onbuild image -# This hardly ever changes so should usually be cached -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf - -# Get all the archive static HTML and put it into place -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.10 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.9 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.8 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.7 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.6 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.5 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.4 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.3 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.2 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.1 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.0 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.10 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.9 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.8 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.7 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.6 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.5 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.4 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.3 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.2 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.1 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.0 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.11 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.10 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.9 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.8 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.7 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.6 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.5 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.4 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.3 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.2 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.1 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.0 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.8 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.7 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.6 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.5 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.4 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.3 ${TARGET} ${TARGET} - -# Serve the site (target), which is now all static HTML -CMD ["sh", "-c", "echo 'GitLab docs are viewable at: http://0.0.0.0:4000'; exec nginx -g 'daemon off;'"] diff --git a/dockerfiles/bootstrap.Dockerfile b/dockerfiles/bootstrap.Dockerfile deleted file mode 100644 index 42d26521..00000000 --- a/dockerfiles/bootstrap.Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -# DEPRECATED: DO NOT UPDATE - -# This is the Nanoc bootstrap Dockerfile which builds an image that contains -# all Nanoc's runtime dependencies and gems. - -# -# Build minifier utility -# Adapted from https://github.com/docker/docker.github.io/blob/publish-tools/Dockerfile.builder -# -FROM golang:1.13-alpine AS minifier -RUN apk add --no-cache git -RUN export GO111MODULE=on \ - && go get -d github.com/tdewolff/minify/v2@latest \ - && go build -v -o /minify github.com/tdewolff/minify/cmd/minify - -# -# Image that contains all needed dependencies -# -FROM registry.gitlab.com/gitlab-org/gitlab-docs:base - -# Copy only the Gemfiles and yarn.lock to install the dependencies -COPY /Gemfile* /source/ -COPY /yarn.lock /source/ -WORKDIR /source - -# Install gems and node libraries -RUN NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4 && \ - yarn install && \ - yarn cache clean - -# Copy scripts used for static HTML post-processing -COPY scripts /scripts/ -COPY --from=minifier /minify /usr/local/bin/minify - -CMD ["echo 'Nothing to do here. This is the bootstrap image that contains all dependencies to build the docs site.'"] diff --git a/dockerfiles/builder.onbuild.Dockerfile b/dockerfiles/builder.onbuild.Dockerfile deleted file mode 100644 index e2e1aff1..00000000 --- a/dockerfiles/builder.onbuild.Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -# Get Nanoc bootstrap -FROM registry.gitlab.com/gitlab-org/gitlab-docs:bootstrap - -# Make the variables of the archive Dockerfiles accessible to this build-stage -ONBUILD ARG VER -ONBUILD ARG NANOC_ENV -ONBUILD ARG CI_COMMIT_REF_NAME - -# Build the docs from this branch -ONBUILD COPY . /source/ -ONBUILD RUN NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4 -ONBUILD RUN yarn install && yarn cache clean -ONBUILD RUN bundle exec rake default -ONBUILD RUN bundle exec nanoc compile -VV -## For 13.9 and later, there's a raketask that is run instead of the -## manual READMEs symlinking that is defined in scripts/normalize-links.sh. -## If the raketask is present, run it. -ONBUILD RUN if [ -f /scripts/check_symlinks.sh ]; then /scripts/check_symlinks.sh; else "/scripts/check_symlinks.sh not found"; fi - -# Move generated HTML to /site -ONBUILD RUN mkdir /site -ONBUILD RUN mv public /site/${VER} - -# Do some HTML post-processing on the archive -ONBUILD RUN if [ -f /scripts/normalize-links.sh ]; then /scripts/normalize-links.sh /site ${VER}; else "/scripts/normalize-links.sh not found"; fi - -# Compress images -ONBUILD RUN if [ -f /scripts/compress_images.sh ]; then /scripts/compress_images.sh /site ${VER}; else "/scripts/compress_images.sh not found"; fi - -# Minify assets -# ATTENTION: This should be the last script to run -ONBUILD RUN if [ -f /scripts/minify-assets.sh ]; then /scripts/minify-assets.sh /site ${VER}; else "/scripts/minify-assets.sh not found"; fi - -# Make an index.html and 404.html which will redirect / to /${VER}/ -ONBUILD RUN echo "<html><head><title>Redirect for ${VER}</title><meta http-equiv=\"refresh\" content=\"0;url='/${VER}/'\" /></head><body><p>If you are not redirected automatically, click <a href=\"/${VER}/\">here</a>.</p></body></html>" > /site/index.html -ONBUILD RUN echo "<html><head><title>Redirect for ${VER}</title><meta http-equiv=\"refresh\" content=\"0;url='/${VER}/'\" /></head><body><p>If you are not redirected automatically, click <a href=\"/${VER}/\">here</a>.</p></body></html>" > /site/404.html diff --git a/dockerfiles/gitlab-docs-base.Dockerfile b/dockerfiles/gitlab-docs-base.Dockerfile deleted file mode 100644 index d9ea119d..00000000 --- a/dockerfiles/gitlab-docs-base.Dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -# -# 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 -ARG ALPINE_VERSION - -FROM ruby:${RUBY_VERSION}-alpine${ALPINE_VERSION} - -# Install dependencies -RUN printf "\n\e[32mINFO: Installing dependencies..\e[39m\n" && apk add --no-cache -U \ - bash \ - build-base \ - curl \ - gcompat \ - git \ - gnupg \ - grep \ - gzip \ - jq \ - libcurl \ - libxslt \ - libxslt-dev \ - minify \ - nodejs \ - openssl \ - pngquant \ - ruby-dev \ - tar \ - xz \ - xz-dev \ - yarn \ - && echo 'gem: --no-document' >> /etc/gemrc \ - && gem update --silent --system \ - && printf "\n\e[32mINFO: Dependency versions:\e[39m\n" \ - && echo "Ruby: $(ruby --version)" \ - && echo "RubyGems: $(gem --version)" \ - && echo "Node.js: $(node --version)" \ - && echo "Yarn: $(yarn --version)" \ - && printf "\n" diff --git a/dockerfiles/nginx.onbuild.Dockerfile b/dockerfiles/nginx.onbuild.Dockerfile deleted file mode 100644 index 1f09fcfc..00000000 --- a/dockerfiles/nginx.onbuild.Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -# Base image to use for building documentation archives. -# This image uses "ONBUILD" to perform all required steps in the archives -# and relies upon its parent image having a layer called `builder`. - -FROM nginx:1.23.1-alpine - -# Make the version accessible to this build-stage, and copy it to an ENV so -# that it persists in the final image. -ONBUILD ARG VER -ONBUILD ENV VER=$VER - -# Clean out any existing HTML files, and copy the HTML from the builder stage -# to the default location for Nginx. -ONBUILD RUN rm -rf /usr/share/nginx/html/* -ONBUILD COPY --from=builder /site /usr/share/nginx/html - -# Copy the Nginx config -COPY dockerfiles/nginx-overrides.conf /etc/nginx/conf.d/default.conf - -# Start Nginx to serve the archive at / (which will redirect to the version-specific dir) -CMD ["sh", "-c", "echo 'GitLab docs are viewable at: http://0.0.0.0:4000'; exec nginx -g 'daemon off;'"] |