Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2021-04-27 09:11:03 +0300
committerTakuya Noguchi <takninnovationresearch@gmail.com>2021-04-28 14:51:36 +0300
commitfe577c0d6e75a91660fb905fb6959280427d657b (patch)
tree9833267701cac725bc696c7982898057f0d7ea19 /dockerfiles
parent81cc2779108f7c25e912b86d5547721c221c09a6 (diff)
Update Golang from 1.13 to 1.16
Co-authored-by: Achilleas Pipinellis <axil@gitlab.com> Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
Diffstat (limited to 'dockerfiles')
-rw-r--r--dockerfiles/Dockerfile.bootstrap8
1 files changed, 2 insertions, 6 deletions
diff --git a/dockerfiles/Dockerfile.bootstrap b/dockerfiles/Dockerfile.bootstrap
index 9dfdd857..678f82ef 100644
--- a/dockerfiles/Dockerfile.bootstrap
+++ b/dockerfiles/Dockerfile.bootstrap
@@ -5,11 +5,7 @@
# 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
+FROM tdewolff/minify AS minifier
#
# Image that contains all needed dependencies
@@ -28,7 +24,7 @@ RUN yarn install
# Copy scripts used for static HTML post-processing
COPY scripts /scripts/
-COPY --from=minifier /minify /usr/local/bin/minify
+COPY --from=minifier /bin/minify /usr/local/bin/minify
MAINTAINER GitLab Documentation Team