Merge branch 'master' into dev

.github/workflows/docker-image.yml

@@ -52,7 +52,7 @@ jobs:
       with:
         context: .
         push: true
-        platforms: linux/amd64,linux/arm64,linux/arm/v6
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
         cache-from: type=gha

Dockerfile

@@ -2,26 +2,26 @@
 ## FROM --platform=$BUILDPLATFORM
 ## See more for cross-compile:
 ## https://dh1tw.de/2019/12/cross-compiling-golang-cgo-projects/
-FROM --platform=$TARGETPLATFORM golang:1.18-alpine3.17 AS server
+FROM golang:1.18-alpine3.17 AS server
 RUN apk update && apk add musl-dev gcc g++ ffmpeg-libs ffmpeg-dev
 WORKDIR /app
 COPY server/go.mod server/go.sum ./
 RUN go mod download -x
 COPY server/ ./
-ARG TARGETOS TARGETARCH
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=1 go build -v -installsuffix cgo -o photo-gallery
+RUN CGO_ENABLED=1 go build -v -o photo-gallery
+# RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=1 go build -v -installsuffix cgo -o photo-gallery
 # For static compilation (not working): -ldflags '-extldflags "-static"'
 
 # Fronted
-FROM --platform=$BUILDPLATFORM node:18-alpine3.17 AS frontend
+FROM node:18-alpine3.17 AS frontend
 WORKDIR /app
 COPY package*.json ./
 RUN npm install
 COPY . .
 RUN npm run build
 
 # Deploy
-FROM --platform=$TARGETPLATFORM alpine:3.17
+FROM alpine:3.17
 WORKDIR /app/server
 EXPOSE 3080
 VOLUME "/photos" "/thumbs"