From 8f04f49086660b8aa1b7e51a3eac4ec63bf111b8 Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Fri, 26 Jul 2024 12:45:24 +0100 Subject: [PATCH] docker: use jfa-go-build-docker for quicker builds we already make the prerequisite container, why not use it for docker builds as well? --- Dockerfile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 253b248..fc1537a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,17 @@ -FROM --platform=$BUILDPLATFORM golang:latest AS support +# Use this instead if hrfee/jfa-go-build-docker doesn't support your architecture +# FROM --platform=$BUILDPLATFORM golang:latest AS support +FROM --platform=$BUILDPLATFORM hrfee/jfa-go-build-docker AS support COPY . /opt/build -RUN apt-get update -y \ - && apt-get install build-essential python3-pip curl software-properties-common sed -y \ - && (curl -sL https://deb.nodesource.com/setup_current.x | bash -) \ - && apt-get install nodejs \ - && (cd /opt/build; make configuration npm email typescript variants-html bundle-css inline-css swagger copy INTERNAL=off GOESBUILD=on) \ +# Uncomment this if hrfee/jfa-go-build-docker doesn't support your architecture +# RUN apt-get update -y \ +# && apt-get install build-essential python3-pip -y \ +# && (curl -sL https://deb.nodesource.com/setup_current.x | bash -) \ +# && apt-get install nodejs +RUN (cd /opt/build; make configuration npm email typescript variants-html bundle-css inline-css swagger copy INTERNAL=off GOESBUILD=on) \ && sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' /opt/build/build/data/html/setup.html - FROM --platform=$BUILDPLATFORM golang:latest AS build ARG TARGETARCH ENV GOARCH=$TARGETARCH