Merge pull request #23 from juroteam/build-update

chore: bump scm to 1.10

Author: juris

Dockerfile

@@ -1,43 +1,24 @@
-FROM alpine:3.18
+FROM alpine:3.22
 
-ARG YQ_VERSION=4.42.1
-ARG SCM_VERSION=1.7.1
-ARG SCM_FILE=scm-backup-1.7.1.09b3532.zip
-ARG DOTNET_FILE=aspnetcore-runtime-3.1.32-linux-musl-x64.tar.gz
-ARG DOTNET_FILE_SHA512=d67edf1ed7817c002e1f444baf3a48b71d6f3328ed3f63287d744445665db846f63d24f4f8dd97f99d85f9d5f28fd0d1f1b8efa0c88ed7545a3ee9cfc491f7d0
+ARG SCM_VERSION=1.10.0
+ARG SCM_FILE=scm-backup-1.10.0.c9d19ac.zip
+ARG SCM_SHA256=c61351cef35d570d17bc785b9a83cd6962480eb730a79cbafd1aa8400573826e
 
 ENV SCM_ROOT=/opt/scm-backup
-ENV DOTNET_ROOT=/opt/dotnet
-ENV PATH=${PATH}:${DOTNET_ROOT}
+ENV SCM_LOCAL_FOLDER=${SCM_ROOT}/backup
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
 
 WORKDIR ${SCM_ROOT}
 
-RUN apk add --no-cache \
-       bash curl git \
-    && apk add pixz \
-    libgcc libintl libssl1.1 \
-    libstdc++ zlib curl git \
-    --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community \
-    # Install dotnet runtime
-    && curl -fsL -o ${DOTNET_FILE} https://download.visualstudio.microsoft.com/download/pr/e94c26b7-6ac0-46b9-81f1-e008ce8348cb/41d57ffacf3e151de8039ec3cd007a68/${DOTNET_FILE} \
-    && echo "${DOTNET_FILE_SHA512}  ${DOTNET_FILE}" > ${DOTNET_FILE}.sha512 \
-    && sha512sum -c ${DOTNET_FILE}.sha512 \
-    && mkdir -p ${DOTNET_ROOT} \
-    && tar zxf ${DOTNET_FILE} -C ${DOTNET_ROOT} \
+RUN apk add --no-cache git yq pixz aspnetcore8-runtime \
     # Install scm-backup
-    && curl -fsL -o ${SCM_FILE} https://github.com/christianspecht/scm-backup/releases/download/${SCM_VERSION}/${SCM_FILE} \
+    && wget https://github.com/christianspecht/scm-backup/releases/download/${SCM_VERSION}/${SCM_FILE} \
+    && echo "${SCM_SHA256} ${SCM_FILE}" | sha256sum -c - \
     && unzip ${SCM_FILE} \
-    && rm -f ${SCM_FILE} ${DOTNET_FILE} ${DOTNET_FILE}.sha512 \
-    # Install yq (config templating)
-    && curl -fSL https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_amd64 -o /usr/local/bin/yq \
-    && chmod +x /usr/local/bin/yq
+    && rm -f ${SCM_FILE} \
+    && mkdir -p ${SCM_LOCAL_FOLDER}
 
-COPY entrypoint.sh /usr/local/bin
 COPY settings.yml .
-RUN chmod +x /usr/local/bin/entrypoint.sh
+COPY --chmod=0755 entrypoint.sh /usr/local/bin
 
 ENTRYPOINT ["entrypoint.sh"]
-
-
-

README.md

@@ -1,17 +1,26 @@
 # Dockerised SCM Backup
+[![GitHub](https://img.shields.io/badge/GitHub-juroteam%2Fdocker--scm--backup-blue?style=flat-square&logo=github)](https://github.com/juroteam/docker-scm-backup)
 
 [SCM Backup](https://scm-backup.org/) in a Docker container. Default configuration is preset to work with Github.
 
 ## Environment Variables
 
 To run this project, you will need the following environment variables
 
+**Required:**
+
 `GH_ORG`
 
 `GH_USER`
 
 `GH_PASS`
 
+**Optional:**
+
+`S3_BUCKET` - If provided, backups will be configured to use S3 storage
+
+> **Note:** When using S3 backup, you are responsible for configuring AWS authentication (credentials, IAM roles, etc.) in your Docker environment.
+
 ## Usage/Examples
 
 ```shell
@@ -20,4 +29,14 @@ docker run -v ${LOCAL_BACKUP_DIRECTORY}:/opt/scm-backup/backup \
            -e GH_PASS=app_password \
            -e GH_ORG=org \
            juroapp/scm-backup
-```
+```
+
+**With S3 backup enabled:**
+```shell
+docker run -v ${LOCAL_BACKUP_DIRECTORY}:/opt/scm-backup/backup \
+           -e GH_USER=username \
+           -e GH_PASS=app_password \
+           -e GH_ORG=org \
+           -e S3_BUCKET=my-backup-bucket \
+           juroapp/scm-backup
+```

entrypoint.sh

@@ -1,8 +1,22 @@
-#!/usr/bin/env bash
-set -euo pipefail
+#!/bin/sh
+set -eu
 
-yq e -i '(.sources[] | select(.title == "github").name) = env(GH_ORG)' settings.yml
-yq e -i '(.sources[] | select(.title == "github").authName) = env(GH_USER)' settings.yml
-yq e -i '(.sources[] | select(.title == "github").password) = env(GH_PASS)' settings.yml
+: "${GH_ORG:?GH_ORG is required}"
+: "${GH_USER:?GH_USER is required}"
+: "${GH_PASS:?GH_PASS is required}"
+: "${SCM_LOCAL_FOLDER:?SCM_LOCAL_FOLDER is required}"
 
-exec dotnet ScmBackup.dll
+yq e -i '
+  .localFolder = env(SCM_LOCAL_FOLDER)
+  | with(.sources[] | select(.title == "github");
+      .name = env(GH_ORG)
+    | .authName = env(GH_USER)
+  )
+  | if has("S3_BUCKET") then
+      .options.backup.s3BucketName = env(S3_BUCKET)
+    else
+      .
+    end
+' settings.yml
+
+exec dotnet ScmBackup.dll

settings.yml

@@ -1,9 +1,9 @@
-localFolder: 'backup'
+localFolder: backup
 
 sources:
   - title: github
     hoster: github
     type: org
     name: team
     authName: username
-    password: password
+    password: '%GH_PASS%'