diff options
| author | Marcel Amirault <4155490-marcel.amirault@users.noreply.gitlab.com> | 2021-05-13 19:18:35 +0300 |
|---|---|---|
| committer | Marcel Amirault <4155490-marcel.amirault@users.noreply.gitlab.com> | 2021-05-13 19:18:35 +0300 |
| commit | 167c5487d393f50dbc413fc14a0eb98fa017b39f (patch) | |
| tree | d6e9171085751d3dde7917c3c08a4e982bdc61a5 /dockerfiles | |
| parent | 4d0df3ddc0bb4a394cd3c610573ab6b941a44c79 (diff) | |
Revert "Merge branch 'golang-1.16' into 'master'"
This reverts merge request !1745
Diffstat (limited to 'dockerfiles')
| -rw-r--r-- | dockerfiles/Dockerfile.bootstrap | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/dockerfiles/Dockerfile.bootstrap b/dockerfiles/Dockerfile.bootstrap index 678f82ef..9dfdd857 100644 --- a/dockerfiles/Dockerfile.bootstrap +++ b/dockerfiles/Dockerfile.bootstrap @@ -5,7 +5,11 @@ # Build minifier utility # Adapted from https://github.com/docker/docker.github.io/blob/publish-tools/Dockerfile.builder # -FROM tdewolff/minify AS minifier +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 @@ -24,7 +28,7 @@ RUN yarn install # Copy scripts used for static HTML post-processing COPY scripts /scripts/ -COPY --from=minifier /bin/minify /usr/local/bin/minify +COPY --from=minifier /minify /usr/local/bin/minify MAINTAINER GitLab Documentation Team |