From c87972c65b6181b76b3dc70545674f6634136658 Mon Sep 17 00:00:00 2001 From: russoj88 Date: Fri, 24 Apr 2020 11:44:55 -0700 Subject: [PATCH] Update Docker files to get hugo from packages. --- Dockerfile.dev | 12 +++++++----- Dockerfile.prod | 8 +++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Dockerfile.dev b/Dockerfile.dev index 64308a7..c89c582 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,11 +1,13 @@ -FROM golang:alpine +FROM alpine:latest # This should be mounted with docker run command WORKDIR /src +RUN cd /src -# Build and run hugo -ENV GO111MODULE=on -RUN go get -u github.com/gohugoio/hugo@v0.69.0 +# Get hugo -- using the edge branch to get latest version +RUN sed -i -e 's/v[[:digit:]]\..*\//edge\//g' /etc/apk/repositories +RUN apk update && apk upgrade && \ + apk add --no-cache hugo=0.69.1-r0 # Run the development server -ENTRYPOINT cd /src && hugo server --bind 0.0.0.0 +ENTRYPOINT hugo server --bind 0.0.0.0 diff --git a/Dockerfile.prod b/Dockerfile.prod index 35c832d..c503214 100644 --- a/Dockerfile.prod +++ b/Dockerfile.prod @@ -1,5 +1,5 @@ # STEP 1: Build the website's files -FROM golang:alpine AS build-website +FROM alpine:latest AS build-website WORKDIR /src @@ -7,8 +7,10 @@ COPY . /src/ RUN cd /src -ENV GO111MODULE=on -RUN go get -u github.com/gohugoio/hugo@v0.69.0 +# Get hugo -- using the edge branch to get latest version +RUN sed -i -e 's/v[[:digit:]]\..*\//edge\//g' /etc/apk/repositories +RUN apk update && apk upgrade && \ + apk add --no-cache hugo=0.69.1-r0 RUN hugo --minify