Merge pull request #1583 from fluxcd/update-docker-support

Add golang to hugo-support image

.github/workflows/build-push-hugo-image.yml

@@ -12,6 +12,7 @@ jobs:
         uses: docker/setup-qemu-action@v2
       -
         name: Set up Docker Buildx
+        id: buildx
         uses: docker/setup-buildx-action@v2
       -
         name: Login to DockerHub
@@ -37,7 +38,9 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: hugo
+          platforms: linux/amd64,linux/arm64
           push: true
+          builder: ${{ steps.buildx.outputs.name }}
           build-args: |
             HUGO_VERSION=${{ env.hugo_version }}
             HUGO_BUILD_TAGS=extended

Dockerfile

@@ -1,5 +1,8 @@
 ARG HUGO_VERSION
 FROM fluxcd/website:hugo-${HUGO_VERSION}-extended
+COPY --from=golang:1.19-alpine /usr/local/go/ /usr/local/go/
+
+ENV PATH="/usr/local/go/bin:${PATH}"
 
 RUN apk update && \
 	apk add --no-cache \
@@ -24,7 +27,9 @@ RUN apk update && \
 COPY requirements.txt /tmp
 RUN python3 -m pip install -r /tmp/requirements.txt
 RUN ln -s `which python3` /usr/bin/python
+COPY package.json package-lock.json /site/
 RUN npm i
+RUN git config --global --add safe.directory /site
 
 # VOLUME /site	# provided by upstream
 # WORKDIR /site