feat: Add ANKISYNCD_COMMIT as a build arg (#45)

* add ANKISYNCD_COMMIT This adds the ability to checkout a specific commit of anki-sync-server as well as specify the version of the image to be built. * feat: Add ANKISYND_COMMIT as a image label --------- Co-authored-by: Vikash Kothary <[email protected]>
ankicommunity · Apr 17, 2024 · 2218ed5 · 2218ed5
1 parent 3424783
commit 2218ed5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/config/.env.example b/config/.env.example
@@ -12,6 +12,7 @@
 ### ANKISYNCD_SESSION_MANAGER
 ### ANKISYNCD_USER_MANAGER
 ### ANKISYNCD_COLLECTION_WRAPPER
+### ANKISYNCD_COMMIT=e719131720151b51f14242ff7cf898916e3b074c
 
 ## Djankiserv
 ### DJANKISERV_VARS_SOURCED="yes"
@@ -41,4 +42,4 @@
 ## Make
 AWK=awk
 BASH=bash
-DOCKER_COMPOSE=docker-compose
+DOCKER_COMPOSE=docker-compose
diff --git a/services/anki-sync-server/images/Dockerfile b/services/anki-sync-server/images/Dockerfile
@@ -9,10 +9,13 @@ WORKDIR ${ANKISYNCD_ROOT}
 
 COPY bin/download-release.sh ./bin/download-release.sh
 
+ARG ANKISYNCD_COMMIT='latest'
+LABEL ANKISYNCD_COMMIT=${ANKISYNCD_COMMIT}
+
 ARG PYTHONUSERBASE
 RUN sh ./bin/download-release.sh && \
 	pip3 install --upgrade pip && \
-    pip3 install --user -r ./release/requirements.txt
+  pip3 install --user -r ./release/requirements.txt
 
 # -- DEPLOYER --
 FROM python:3.9-slim-buster

diff --git a/services/anki-sync-server/images/bin/download-release.sh b/services/anki-sync-server/images/bin/download-release.sh
@@ -1,15 +1,22 @@
 #!/bin/sh
 # file: download-release.sh
 
+set -eu
 
 mkdir -p release
 
 cd release
 
 git clone https://github.com/ankicommunity/anki-sync-server
 
+if [ "${ANKISYNCD_COMMIT}" != 'latest' ]; then
+  cd anki-sync-server
+  git checkout "${ANKISYNCD_COMMIT}"
+  cd ..
+fi
+
 mv anki-sync-server/src/* .
 
 rm -rf anki-sync-server
 
-cd ..
+cd ..
diff --git a/services/anki-sync-server/images/docker-compose.yml b/services/anki-sync-server/images/docker-compose.yml
@@ -11,4 +11,5 @@ services:
         - ANKISYNCD_BASE_URL=${ANKISYNCD_BASE_URL:-/sync/}
         - ANKISYNCD_BASE_MEDIA_URL=${ANKISYNCD_BASE_MEDIA_URL:-/msync/}
         - ANKISYNCD_AUTH_DB_PATH=${ANKISYNCD_AUTH_DB_PATH:-./auth.db}
-        - ANKISYNCD_SESSION_DB_PATH=${ANKISYNCD_SESSION_DB_PATH:-./session.db}
+        - ANKISYNCD_SESSION_DB_PATH=${ANKISYNCD_SESSION_DB_PATH:-./session.db}
+        - ANKISYNCD_COMMIT=${ANKISYNCD_COMMIT:-latest}