Merge branch 'master' into feature/arm64

.github/workflows/main.yml

@@ -44,6 +44,9 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
+          platforms: |-
+            linux/arm64
+            linux/amd64
           tags: |
             t4skforce/syncthing-relay:latest
             t4skforce/syncthing-relay:${{ env.RELEASE_VERSION }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:latest
+FROM --platform=$TARGETPLATFORM debian:latest
 ########################################
 #              Settings                #
 ########################################
@@ -39,9 +39,12 @@ ARG REQUIREMENTS="openssl ca-certificates"
 ########################################
 #               Build                  #
 ########################################
+ARG BUILDPLATFORM
+ARG TARGETPLATFORM
 ARG VERSION="v1.22.1"
-ARG DOWNLOADURL="https://github.com/syncthing/relaysrv/releases/download/v1.22.1/strelaysrv-linux-amd64-v1.22.1.tar.gz"
-ARG BUILD_DATE="2023-09-15T12:40:25Z"
+ARG DOWNLOAD_URL_PREFIX="https://github.com/syncthing/relaysrv/releases/download"
+ARG BIN_NAME="strelaysrv"
+ARG BUILD_DATE="2023-11-17T13:40:11Z"
 ########################################
 
 USER root
@@ -57,10 +60,9 @@ RUN apt-get update -qqy \
 
 # install relay
 WORKDIR /tmp/
-RUN curl -Ls ${DOWNLOADURL} --output relaysrv.tar.gz \
-	&& tar -zxf relaysrv.tar.gz \
-	&& rm relaysrv.tar.gz \
-	&& mkdir -p ${USER_HOME}/server ${USER_HOME}/certs \
+COPY download.sh /tmp/download.sh
+RUN ./download.sh "${DOWNLOAD_URL_PREFIX}" "${BIN_NAME}" "${VERSION}" "${TARGETPLATFORM}"
+RUN mkdir -p ${USER_HOME}/server ${USER_HOME}/certs \
 	&& cp /tmp/*relaysrv*/*relaysrv ${USER_HOME}/server/relaysrv \
 	&& chown -R ${USERNAME}:${USERGROUP} ${USER_HOME}
 

download.sh

@@ -0,0 +1,14 @@
+#!/bin/bash -xe
+
+url_prefix="${1}"
+bin_name="${2}"
+version="${3}"
+arch=$(echo "${4}" | cut -d"/" -f2)
+
+dl_url="${url_prefix}/${version}/${bin_name}-linux-${arch}-${version}.tar.gz"
+
+echo "Downloading \"${dl_url}\"..."
+
+curl -Ls "${dl_url}" --output relaysrv.tar.gz \
+  && tar -zxf relaysrv.tar.gz \
+  && rm relaysrv.tar.gz