From 876044ce74f0fcf6aad895d7dbaf858f2b288d52 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Sun, 7 Jan 2024 16:35:48 +0100
Subject: [PATCH] use code.0x2620.org as container registry

---
 docker/base/Dockerfile         | 2 +-
 docker/entrypoint.sh           | 6 +++---
 docker/publish.sh              | 8 ++++----
 docker/setup-docker-compose.sh | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index 32c536aeb..199af6421 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye
+FROM debian:12
 
 LABEL maintainer="0x2620@0x2620.org"
 
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 123883f8d..36ef5b4a7 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -6,7 +6,7 @@ user=pandora
 
 export LANG=en_US.UTF-8
 mkdir -p /run/pandora
-chown -R ${user}.${user} /run/pandora
+chown -R ${user}:${user} /run/pandora
 
 update="/usr/bin/sudo -u $user -E -H /srv/pandora/update.py"
 
@@ -103,9 +103,9 @@ fi
 # pan.do/ra setup hooks
 if [ "$action" = "docker-compose.yml" ]; then
     cat /srv/pandora_base/docker-compose.yml | \
-        sed "s#build: \.#image: 0x2620/pandora:latest#g" | \
+        sed "s#build: \.#image: code.0x2620.org/0x2620/pandora:latest#g" | \
         sed "s#\./overlay:#.:#g" | \
-        sed "s#build: docker/nginx#image: 0x2620/pandora-nginx:latest#g"
+        sed "s#build: docker/nginx#image: code.0x2620.org/0x2620/pandora-nginx:latest#g"
     exit
 fi
 if [ "$action" = ".env" ]; then
diff --git a/docker/publish.sh b/docker/publish.sh
index f4ef0193b..b40e026a1 100644
--- a/docker/publish.sh
+++ b/docker/publish.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# push new version of pan.do/ra to docker hub
+# push new version of pan.do/ra to code.0x2620.org
 set -e
 
 cd /tmp
@@ -7,6 +7,6 @@ git clone https://code.0x2620.org/0x2620/pandora
 cd pandora
 ./docker/build.sh
 
-docker push 0x2620/pandora-base:latest
-docker push 0x2620/pandora-nginx:latest
-docker push 0x2620/pandora:latest
+docker push 0x2620/pandora-base:latest code.0x2620.org/0x2620/pandora-base:latest
+docker push 0x2620/pandora-nginx:latest code.0x2620.org/0x2620/pandora-nginx:latest
+docker push 0x2620/pandora:latest code.0x2620.org/0x2620/pandora:latest
diff --git a/docker/setup-docker-compose.sh b/docker/setup-docker-compose.sh
index 2f48179f9..09f9d392d 100755
--- a/docker/setup-docker-compose.sh
+++ b/docker/setup-docker-compose.sh
@@ -1,18 +1,18 @@
 #!/bin/sh
-docker run 0x2620/pandora docker-compose.yml > docker-compose.yml
+docker run code.0x2620.org/0x2620/pandora docker-compose.yml > docker-compose.yml
 if [ ! -e .env ]; then
-    docker run 0x2620/pandora .env > .env
+    docker run code.0x2620.org/0x2620/pandora .env > .env
     echo .env >> .gitignore
 fi
 if [ ! -e config.jsonc ]; then
-    docker run 0x2620/pandora config.jsonc > config.jsonc
+    docker run code.0x2620.org/0x2620/pandora config.jsonc > config.jsonc
 fi
 cat > README.md << EOF
 pan.do/ra docker instance
 
 this folder was created with
 
-    docker run 0x2620/pandora setup | sh
+    docker run code.0x2620.org/0x2620/pandora setup | sh
 
 To start pan.do/ra adjust the files in this folder: