simplesystems/website
simplesystems/website
1
0
Fork 0
Code Issues 18 Pull Requests Actions Wiki Activity

Update hugo to latest version. Clean up dockerfiles. #16

Merged
jeff merged 1 commits from UpdateHugo-0_71 into master 2020-05-21 02:42:36 +00:00
Conversation 0 Commits 1 Files Changed 2 +12 -11
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit da2218625a - Show all commits

11
Dockerfile.dev
View File

@ -1,11 +1,12 @@
FROM golang:alpine FROM alpine:latest
# This should be mounted with docker run command # This should be mounted with docker run command
WORKDIR /src WORKDIR /src
# Build and run hugo # Get hugo -- using the edge branch to get latest version
ENV GO111MODULE=on RUN sed -i -e 's/v[[:digit:]]\..*\//edge\//g' /etc/apk/repositories
RUN go get -u github.com/gohugoio/hugo@v0.69.0 RUN apk update && apk upgrade && \
apk add --no-cache hugo=0.71.0-r0
# Run the development server # Run the development server
ENTRYPOINT cd /src && hugo server --bind 0.0.0.0 ENTRYPOINT hugo server --bind 0.0.0.0

12
Dockerfile.prod
View File

@ -1,18 +1,18 @@
# STEP 1: Build the website's files # STEP 1: Build the website's files
FROM golang:alpine AS build-website FROM alpine:latest AS build-website
WORKDIR /src WORKDIR /src
COPY . /src/ COPY . /src/
RUN cd /src # Get hugo -- using the edge branch to get latest version
RUN sed -i -e 's/v[[:digit:]]\..*\//edge\//g' /etc/apk/repositories
ENV GO111MODULE=on RUN apk update && apk upgrade && \
RUN go get -u github.com/gohugoio/hugo@v0.69.0 apk add --no-cache hugo=0.71.0-r0
RUN hugo --minify RUN hugo --minify
# STEP 2: Get a binary for the static-web-server # STEP 2: Build the static-web-server
FROM golang:alpine AS build-webserver FROM golang:alpine AS build-webserver
RUN apk update && apk upgrade && \ RUN apk update && apk upgrade && \