diff --git a/docker-compose.yml b/docker-compose.yml index ade526cb..1360247c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,6 +15,7 @@ services: - "127.0.0.1:2620:80" networks: - backend + - default links: - pandora - websocketd diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 199af642..32c536ae 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:12 +FROM debian:bullseye LABEL maintainer="0x2620@0x2620.org" diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 36ef5b4a..123883f8 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: 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 diff --git a/docker/publish.sh b/docker/publish.sh index b40e026a..f4ef0193 100644 --- a/docker/publish.sh +++ b/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 diff --git a/docker/setup-docker-compose.sh b/docker/setup-docker-compose.sh index 09f9d392..2f48179f 100755 --- a/docker/setup-docker-compose.sh +++ b/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: