Fix pin docker tags and use env vars for overriding image versions

compose/docker-compose.override-lnd.yml

@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   lnd:
-    image: lightninglabs/lnd:${LND_VERSION}
+    image: lightninglabs/lnd:${LND_TAG:-v0.17.0-beta@sha256:2083f29a36bc0b40c6c9c687c9e71bc447bd4f9f9d21aea1f3d5b1d462e7e93e}
     restart: always
     network_mode: service:tor
     container_name: lnd${SUFFIX}
@@ -20,7 +20,7 @@ services:
       LND_REST_PORT: ${GUEST_LND_REST_PORT:?}
 
   thub:
-    image: apotdevin/thunderhub:v0.13.18
+    image: apotdevin/thunderhub:${THUNDERHUB_TAG:-v0.13.23@sha256:5ad834045dc3030ec199615827c415ca07729da32c4739afd3adfc662af4fe65}
     restart: always
     network_mode: service:tor
     container_name: thub${SUFFIX}
@@ -34,7 +34,7 @@ services:
       - ${THUB_ACCOUNTS:?}:${THUB_ACCOUNTS_CONFIG_PATH:?}
 
   lit:
-    image: lightninglabs/lightning-terminal:v0.10.5-alpha
+    image: lightninglabs/lightning-terminal:${LIT_TAG:-v0.11.0-alpha@sha256:dc14c495f699b14c2d75c43097ad3ab40e7287fc136a3203df9cffe17b867b71}
     restart: always
     network_mode: service:tor
     container_name: lit${SUFFIX}

compose/docker-compose.yml

@@ -15,7 +15,7 @@ services:
       - ${LIT_LOCAL_PORT}:8443
 
   bitcoind:
-    image: ruimarinho/bitcoin-core:${BITCOIND_VERSION}
+    image: ruimarinho/bitcoin-core:${BITCOIND_TAG:-24.0.1-alpine@sha256:624b6fb1c282a3db6438ff35fbb9eed6ae260c66ffbb427ae72edd7da6a0ecdc}
     container_name: btc${SUFFIX}
     restart: always
     depends_on:
@@ -27,7 +27,7 @@ services:
       - ${BITCOIN_CONF:?}:${GUEST_BITCOIN:?}/bitcoin.conf
 
   daphne:
-    image: recksato/robosats:${ROBOSATS_DOCKER_TAG}
+    image: recksato/robosats:${ROBOSATS_TAG:-77783e1@sha256:38d208a757ba20f578320a178db70f4d539f827dc25379eebc002c6310ae707e}
     container_name: daphne${SUFFIX}
     restart: always
     network_mode: service:tor
@@ -40,7 +40,7 @@ services:
     command: daphne -b 0.0.0.0 -p 9000 robosats.asgi:application
 
   redis:
-    image: redis:6.2.6
+    image: redis:${REDIS_TAG:-7.2.1-alpine@sha256:7f5a0dfbf379db69dc78434091dce3220e251022e71dcdf36207928cbf9010de}
     container_name: redis${SUFFIX}
     restart: always
     volumes:
@@ -48,7 +48,7 @@ services:
     network_mode: service:tor
 
   robosats:
-    image: recksato/robosats:${ROBOSATS_DOCKER_TAG}
+    image: recksato/robosats:${ROBOSATS_TAG:-77783e1@sha256:38d208a757ba20f578320a178db70f4d539f827dc25379eebc002c6310ae707e}
     container_name: rs${SUFFIX}
     restart: always
     environment:
@@ -63,7 +63,7 @@ services:
     command: gunicorn --bind :8000 --max-requests 1000 --max-requests-jitter 200 -w ${GUNICORN_WORKERS} robosats.wsgi:application
 
   postgres:
-    image: postgres:14.2-alpine
+    image: postgres:${POSTGRES_TAG:-14.2-alpine@sha256:2fb5718f2a23dbac9bd1258e886eee90250a5903785e3136d62dd65e19f34982}
     container_name: sql${SUFFIX}
     restart: always
     environment:
@@ -75,7 +75,7 @@ services:
       - ${DATABASE}:/var/lib/postgresql/data
 
   nginx:
-    image: nginx:1.21.6
+    image: nginx:${NGINX_TAG:-1.25.2-alpine-slim@sha256:1b0cb433e90260a96528c987ee78b797e842d510473935304a0931536d10f50d}
     container_name: nginx${SUFFIX}
     restart: always
     volumes:
@@ -85,7 +85,7 @@ services:
     network_mode: service:tor
 
   clean-orders:
-    image: recksato/robosats:${ROBOSATS_DOCKER_TAG}
+    image: recksato/robosats:${ROBOSATS_TAG:-77783e1@sha256:38d208a757ba20f578320a178db70f4d539f827dc25379eebc002c6310ae707e}
     restart: always
     container_name: clord${SUFFIX}
     command: python3 manage.py clean_orders
@@ -96,7 +96,7 @@ services:
     network_mode: service:tor
 
   follow-invoices:
-    image: recksato/robosats:${ROBOSATS_DOCKER_TAG}
+    image: recksato/robosats:${ROBOSATS_TAG:-77783e1@sha256:38d208a757ba20f578320a178db70f4d539f827dc25379eebc002c6310ae707e}
     container_name: invo${SUFFIX}
     restart: always
     env_file:
@@ -107,7 +107,7 @@ services:
     network_mode: service:tor
 
   telegram-watcher:
-    image: recksato/robosats:${ROBOSATS_DOCKER_TAG}
+    image: recksato/robosats:${ROBOSATS_TAG:-77783e1@sha256:38d208a757ba20f578320a178db70f4d539f827dc25379eebc002c6310ae707e}
     container_name: tg${SUFFIX}
     restart: always
     environment:
@@ -118,7 +118,7 @@ services:
     network_mode: service:tor
 
   celery:
-    image: recksato/robosats:${ROBOSATS_DOCKER_TAG}
+    image: recksato/robosats:${ROBOSATS_TAG:-77783e1@sha256:38d208a757ba20f578320a178db70f4d539f827dc25379eebc002c6310ae707e}
     container_name: cele${SUFFIX}
     restart: always
     env_file:
@@ -131,7 +131,7 @@ services:
     network_mode: service:tor
 
   celery-beat:                                 
-    image: recksato/robosats:${ROBOSATS_DOCKER_TAG}
+    image: recksato/robosats:${ROBOSATS_TAG:-77783e1@sha256:38d208a757ba20f578320a178db70f4d539f827dc25379eebc002c6310ae707e}
     container_name: beat${SUFFIX}
     restart: always
     env_file:

compose/env-sample/clntn/compose.env

@@ -1,4 +1,10 @@
-ROBOSATS_DOCKER_TAG='77783e1@sha256:38d208a757ba20f578320a178db70f4d539f827dc25379eebc002c6310ae707e'
+# Uncomment the dockerhub tags to override the image versions localy without need to fork the docker-compose.yml
+
+# ROBOSATS_TAG='77783e1@sha256:38d208a757ba20f578320a178db70f4d539f827dc25379eebc002c6310ae707e'
+# BITCOIND_TAG='24.0.1-alpine@sha256:624b6fb1c282a3db6438ff35fbb9eed6ae260c66ffbb427ae72edd7da6a0ecdc'
+# REDIS_TAG='7.2.1-alpine@sha256:7f5a0dfbf379db69dc78434091dce3220e251022e71dcdf36207928cbf9010de'
+# NGINX_TAG='1.25.2-alpine-slim@sha256:1b0cb433e90260a96528c987ee78b797e842d510473935304a0931536d10f50d'
+# POSTGRES_TAG='14.2-alpine@sha256:2fb5718f2a23dbac9bd1258e886eee90250a5903785e3136d62dd65e19f34982'
 
 STATIC='/custom_path/testnet/static'
 DATABASE='/custom_path/testnet/database'

compose/env-sample/lndtn/compose.env

@@ -1,4 +1,14 @@
-ROBOSATS_DOCKER_TAG='77783e1@sha256:38d208a757ba20f578320a178db70f4d539f827dc25379eebc002c6310ae707e'
+# Uncomment the dockerhub tags to override the image versions localy without need to fork the docker-compose.yml
+
+# ROBOSATS_TAG='77783e1@sha256:38d208a757ba20f578320a178db70f4d539f827dc25379eebc002c6310ae707e'
+# BITCOIND_TAG='24.0.1-alpine@sha256:624b6fb1c282a3db6438ff35fbb9eed6ae260c66ffbb427ae72edd7da6a0ecdc'
+# REDIS_TAG='7.2.1-alpine@sha256:7f5a0dfbf379db69dc78434091dce3220e251022e71dcdf36207928cbf9010de'
+# NGINX_TAG='1.25.2-alpine-slim@sha256:1b0cb433e90260a96528c987ee78b797e842d510473935304a0931536d10f50d'
+# POSTGRES_TAG='14.2-alpine@sha256:2fb5718f2a23dbac9bd1258e886eee90250a5903785e3136d62dd65e19f34982'
+
+# LND_TAG='v0.17.0-beta@sha256:2083f29a36bc0b40c6c9c687c9e71bc447bd4f9f9d21aea1f3d5b1d462e7e93e'
+# THUNDERHUB_TAG='v0.13.23@sha256:5ad834045dc3030ec199615827c415ca07729da32c4739afd3adfc662af4fe65'
+# LIT_TAG='v0.11.0-alpha@sha256:dc14c495f699b14c2d75c43097ad3ab40e7287fc136a3203df9cffe17b867b71'
 
 STATIC='/custom_path/testnet/static'
 DATABASE='/custom_path/testnet/database'
@@ -15,9 +25,6 @@ POSTGRES_NAME='postgres'
 POSTGRES_USER='postgres'
 POSTGRES_PASSWORD='example'
 
-BITCOIND_VERSION='24.0.1-alpine'
-LND_VERSION='v0.17.0-beta'
-
 NGINX_CONFD='./nginx/tn.conf.d'
 WELLKNOWN='./nginx/tn.well-known'