File tree 2 files changed +8
-9
lines changed
2 files changed +8
-9
lines changed Original file line number Diff line number Diff line change @@ -32,8 +32,7 @@ FROM unikraft/kraft:staging AS devenv
32
32
LABEL maintainer "Alexander Jung <a.jung@lancs.ac.uk>"
33
33
34
34
ARG HUGO_VER=0.98.0
35
- ARG HUGO_ARCH=64bit
36
- ARG GO_VER=1.17.6
35
+ ARG GO_VER=1.18.3
37
36
ARG GO_ARCH=amd64
38
37
ARG BUILD_REF=latest
39
38
@@ -59,16 +58,18 @@ RUN set -xe; \
59
58
nodejs yarn; \
60
59
npm install -g esbuild-linux-64; \
61
60
npm install; \
62
- cd /tmp; \
63
- curl -LO https://github.com/gohugoio/hugo/releases/download/v${HUGO_VER}/hugo_extended_${HUGO_VER}_Linux-${HUGO_ARCH}.tar.gz; \
64
- tar -xzf hugo_extended_${HUGO_VER}_Linux-${HUGO_ARCH}.tar.gz; \
65
- mv ./hugo /usr/local/bin/hugo; \
66
61
wget -O /tmp/go.tar.gz https://go.dev/dl/go${GO_VER}.linux-${GO_ARCH}.tar.gz; \
67
62
tar -C /usr/local -xzf /tmp/go.tar.gz; \
68
- rm /tmp/go.tar.gz
63
+ rm /tmp/go.tar.gz; \
64
+ git clone --branch v${HUGO_VER} https://github.com/gohugoio/hugo.git /tmp/hugo
69
65
70
66
ENV PATH="${PATH}:/usr/local/go/bin"
71
67
68
+ RUN set -xe; \
69
+ cd /tmp/hugo; \
70
+ GOBIN=/usr/local/bin/ CGO_ENABLED=1 go install --tags extended; \
71
+ rm -rf /tmp/hugo
72
+
72
73
ENTRYPOINT [ "" ]
73
74
74
75
EXPOSE 1313
Original file line number Diff line number Diff line change 58
58
59
59
.PHONY : container
60
60
container : DOCKER_BUILD_EXTRA ?=
61
- container : HUGO_ARCH ?= 64bit
62
61
container : GO_ARCH ?= amd64
63
62
container : TAG ?= devenv
64
63
container : TARGET ?= devenv
65
64
container :
66
65
$(DOCKER ) build \
67
- --build-arg HUGO_ARCH=$(HUGO_ARCH ) \
68
66
--build-arg GO_ARCH=$(GO_ARCH ) \
69
67
--file $(WORKDIR ) /Dockerfile \
70
68
--target $(TARGET ) \
You can’t perform that action at this time.
0 commit comments