docker-compose.yml

@@ -15,6 +15,7 @@ services:
             - "127.0.0.1:2620:80"
         networks:
             - backend
+            - default
         links:
             - pandora
             - websocketd

docker/base/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:12
+FROM debian:bullseye
 
 LABEL maintainer="0x2620@0x2620.org"
 

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: code.0x2620.org/0x2620/pandora:latest#g" | \
+        sed "s#build: \.#image: 0x2620/pandora:latest#g" | \
         sed "s#\./overlay:#.:#g" | \
-        sed "s#build: docker/nginx#image: code.0x2620.org/0x2620/pandora-nginx:latest#g"
+        sed "s#build: docker/nginx#image: 0x2620/pandora-nginx:latest#g"
     exit
 fi
 if [ "$action" = ".env" ]; then

docker/publish.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# push new version of pan.do/ra to code.0x2620.org
+# push new version of pan.do/ra to docker hub
 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 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
+docker push 0x2620/pandora-base:latest
+docker push 0x2620/pandora-nginx:latest
+docker push 0x2620/pandora:latest

docker/setup-docker-compose.sh

@@ -1,18 +1,18 @@
 #!/bin/sh
-docker run code.0x2620.org/0x2620/pandora docker-compose.yml > docker-compose.yml
+docker run 0x2620/pandora docker-compose.yml > docker-compose.yml
 if [ ! -e .env ]; then
-    docker run code.0x2620.org/0x2620/pandora .env > .env
+    docker run 0x2620/pandora .env > .env
     echo .env >> .gitignore
 fi
 if [ ! -e config.jsonc ]; then
-    docker run code.0x2620.org/0x2620/pandora config.jsonc > config.jsonc
+    docker run 0x2620/pandora config.jsonc > config.jsonc
 fi
 cat > README.md << EOF
 pan.do/ra docker instance
 
 this folder was created with
 
-    docker run code.0x2620.org/0x2620/pandora setup | sh
+    docker run 0x2620/pandora setup | sh
 
 To start pan.do/ra adjust the files in this folder: