Make the build work in Docker as well
This commit is contained in:
+2
-11
@@ -1,19 +1,10 @@
|
|||||||
FROM debian AS builder
|
FROM debian AS builder
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apt-get update && apt-get install -y curl git
|
||||||
&& apt-get install -y curl jq git \
|
|
||||||
&& ARCH=$(uname -m | sed -e 's/x86_/amd/' -e 's/aarch/arm/') \
|
|
||||||
&& echo ">>> ARCH $ARCH" \
|
|
||||||
&& URL=$(curl -sS -H 'Accept: appliction/vnd.github.v3+json' https://api.github.com/repos/gohugoio/hugo/releases/latest | jq -r '.assets[] | select(.name | test("hugo_[^e].*linux-'$ARCH'.tar.gz")) | .browser_download_url') \
|
|
||||||
&& echo ">>> URL $URL" \
|
|
||||||
&& curl -sSL -o hugo.tar.gz $URL \
|
|
||||||
&& tar -C /usr/local/bin -xf hugo.tar.gz hugo
|
|
||||||
|
|
||||||
COPY . /site
|
COPY . /site
|
||||||
|
|
||||||
WORKDIR /site
|
WORKDIR /site
|
||||||
|
RUN ./build.sh
|
||||||
RUN hugo
|
|
||||||
|
|
||||||
FROM nginx
|
FROM nginx
|
||||||
|
|
||||||
|
|||||||
@@ -3,16 +3,10 @@
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
HUGO_VERSION=0.148.2
|
HUGO_VERSION=0.148.2
|
||||||
GO_VERSION=1.24.5
|
|
||||||
|
|
||||||
export TZ=Europe/Oslo
|
export TZ=Europe/Oslo
|
||||||
|
|
||||||
# Install Go
|
mkdir -p "${HOME}/.local"
|
||||||
echo "Installing Go ${GO_VERSION}..."
|
|
||||||
curl -sLJO "https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz"
|
|
||||||
tar -C "${HOME}/.local" -xf "go${GO_VERSION}.linux-amd64.tar.gz"
|
|
||||||
rm "go${GO_VERSION}.linux-amd64.tar.gz"
|
|
||||||
export PATH="${HOME}/.local/go/bin:${PATH}"
|
|
||||||
|
|
||||||
# Install Hugo
|
# Install Hugo
|
||||||
echo "Installing Hugo ${HUGO_VERSION}..."
|
echo "Installing Hugo ${HUGO_VERSION}..."
|
||||||
@@ -24,7 +18,6 @@ export PATH="${HOME}/.local/hugo:${PATH}"
|
|||||||
|
|
||||||
# Verify installations
|
# Verify installations
|
||||||
echo "Verifying installations..."
|
echo "Verifying installations..."
|
||||||
echo Go: "$(go version)"
|
|
||||||
echo Hugo: "$(hugo version)"
|
echo Hugo: "$(hugo version)"
|
||||||
|
|
||||||
# Configure Git
|
# Configure Git
|
||||||
|
|||||||
Reference in New Issue
Block a user