From d4715f5a0312ff928ce8a23a462211ff163f72ce Mon Sep 17 00:00:00 2001
From: Dilan Gilluly <gillulyd@gmail.com>
Date: Sat, 24 Jan 2026 13:38:15 -0500
Subject: [PATCH] More unified versioning for server

---
 deployment/remote_server/compose.yml            | 6 +++---
 deployment/remote_server/package.sh             | 5 +++++
 deployment/remote_server/start-server.sh        | 3 ++-
 deployment/remote_server_secure/compose.yml     | 6 +++---
 deployment/remote_server_secure/package.sh      | 5 +++++
 deployment/remote_server_secure/start-server.sh | 3 ++-
 6 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 deployment/remote_server/package.sh
 create mode 100644 deployment/remote_server_secure/package.sh

diff --git a/deployment/remote_server/compose.yml b/deployment/remote_server/compose.yml
index a27b39a..e1ca7ca 100644
--- a/deployment/remote_server/compose.yml
+++ b/deployment/remote_server/compose.yml
@@ -1,6 +1,6 @@
 services:
   tam3-db:
-    image: docker.io/dbob16/tam3-db:0.2.0
+    image: docker.io/dbob16/tam3-db:${TAM3_VERSION}
     restart: always
     environment:
       MARIADB_RANDOM_ROOT_PASSWORD: 1
@@ -16,7 +16,7 @@ services:
       timeout: 5s
       retries: 3
   tam3-api:
-    image: docker.io/dbob16/tam3-api:0.2.0
+    image: docker.io/dbob16/tam3-api:${TAM3_VERSION}
     restart: always
     environment:
       TAM3_DATA_PATH: /data
@@ -25,4 +25,4 @@ services:
       TAM3_DB_USER: tam3
       TAM3_DB_PASSWD: ${DB_PASSWORD}
     ports:
-      - "8000:80"
\ No newline at end of file
+      - "8000:80"
diff --git a/deployment/remote_server/package.sh b/deployment/remote_server/package.sh
new file mode 100644
index 0000000..e2df84c
--- /dev/null
+++ b/deployment/remote_server/package.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source ../common.sh
+
+tar -cvzf tam3-remote-server_${tam3_version}.tar.gz compose.yml delete-key.sh generate-key.sh list-keys.sh start-server.sh
diff --git a/deployment/remote_server/start-server.sh b/deployment/remote_server/start-server.sh
index f46abdb..a4afa47 100755
--- a/deployment/remote_server/start-server.sh
+++ b/deployment/remote_server/start-server.sh
@@ -4,6 +4,7 @@ gen_password=$(cat /dev/urandom | tr -dc A-Za-z0-9 | head -c 32)
 
 echo "DB_LOCATION=./tam3-db" > .env
 echo "DB_PASSWORD=${gen_password}" >> .env
+echo "TAM3_VERSION=0.3.0" >> .env
 
 if [ -x "$(command -v docker)" ]; then
 docker compose up -d
@@ -12,4 +13,4 @@ podman compose up -d
 else
 echo "Neither Docker nor Podman are installed. Please install whichever you prefer and try again."
 exit 1
-fi
\ No newline at end of file
+fi
diff --git a/deployment/remote_server_secure/compose.yml b/deployment/remote_server_secure/compose.yml
index 4fb85f7..1d67d5f 100644
--- a/deployment/remote_server_secure/compose.yml
+++ b/deployment/remote_server_secure/compose.yml
@@ -1,6 +1,6 @@
 services:
   tam3-db:
-    image: docker.io/dbob16/tam3-db:0.2.0
+    image: docker.io/dbob16/tam3-db:${TAM3_VERSION}
     restart: always
     environment:
       MARIADB_RANDOM_ROOT_PASSWORD: 1
@@ -16,7 +16,7 @@ services:
       timeout: 5s
       retries: 3
   tam3-api:
-    image: docker.io/dbob16/tam3-api:0.2.0
+    image: docker.io/dbob16/tam3-api:0.2.0${TAM3_VERSION}
     restart: always
     environment:
       TAM3_DATA_PATH: /data
@@ -33,4 +33,4 @@ services:
       - "8443:443"
     volumes:
       - "./nginx/default.conf:/etc/nginx/conf.d/default.conf:ro,z"
-      - "./nginx/certs:/certs:ro,z"
\ No newline at end of file
+      - "./nginx/certs:/certs:ro,z"
diff --git a/deployment/remote_server_secure/package.sh b/deployment/remote_server_secure/package.sh
new file mode 100644
index 0000000..5f43904
--- /dev/null
+++ b/deployment/remote_server_secure/package.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source ../common.sh
+
+tar -cvzf tam3-remote-server-secure_${tam3_version}.tar.gz compose.yml delete-key.sh generate-key.sh list-keys.sh start-server.sh nginx/
diff --git a/deployment/remote_server_secure/start-server.sh b/deployment/remote_server_secure/start-server.sh
index 929b505..639568f 100755
--- a/deployment/remote_server_secure/start-server.sh
+++ b/deployment/remote_server_secure/start-server.sh
@@ -8,6 +8,7 @@ gen_password=$(cat /dev/urandom | tr -dc A-Za-z0-9 | head -c 32)
 
 echo "DB_LOCATION=./tam3-db" > .env
 echo "DB_PASSWORD=${gen_password}" >> .env
+echo "TAM3_VERSION=0.3.0"
 
 if [ -x "$(command -v docker)" ]; then
 docker compose up -d
@@ -16,4 +17,4 @@ podman compose up -d
 else
 echo "Neither Docker nor Podman are installed. Please install whichever you prefer and try again."
 exit 1
-fi
\ No newline at end of file
+fi