From 93bbb705ccb73d91733f5ca6016c233ee56968ec Mon Sep 17 00:00:00 2001 From: casjay Date: Sun, 8 Nov 2026 10:36:07 -0500 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Move=20Dockerfile=20and=20?= =?UTF-8?q?rootfs=20to=20repo=20root=20per=20AI.md=20=E2=99=BB=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Dockerfile: moved from docker/Dockerfile; COPY paths now rootfs/ and Dockerfile - rootfs/usr/local/bin/entrypoint.sh, healthcheck.sh: moved from docker/rootfs/ - rootfs/usr/local/share/prosody-plugins/: moved from docker/rootfs/ (mod_auth_openfire_hybrid, mod_user_api) - docker/compose.yml: removed; the example now lives in the README compose section - .github/workflows/ci.yml, release.yml: build file is now Dockerfile - .github/CODEOWNERS: drop the docker/ entry - .gitignore, .dockerignore: drop docker/volumes/ - README.md: compose section replaced with the current example --- .dockerignore | 1 - .github/CODEOWNERS | 3 - .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- .gitignore | 1 - docker/Dockerfile => Dockerfile | 4 +- README.md | 67 +++++++++++++++---- docker/compose.yml | 57 ---------------- .../usr/local/bin/entrypoint.sh | 0 .../usr/local/bin/healthcheck.sh | 0 .../mod_auth_openfire_hybrid.lua | 0 .../share/prosody-plugins/mod_user_api.lua | 0 12 files changed, 59 insertions(+), 78 deletions(-) rename docker/Dockerfile => Dockerfile (97%) delete mode 100644 docker/compose.yml rename {docker/rootfs => rootfs}/usr/local/bin/entrypoint.sh (100%) rename {docker/rootfs => rootfs}/usr/local/bin/healthcheck.sh (100%) rename {docker/rootfs => rootfs}/usr/local/share/prosody-plugins/mod_auth_openfire_hybrid.lua (100%) rename {docker/rootfs => rootfs}/usr/local/share/prosody-plugins/mod_user_api.lua (100%) diff --git a/.dockerignore b/.dockerignore index 3f0c0cd..b0b8edd 100644 --- a/.dockerignore +++ b/.dockerignore @@ -17,7 +17,6 @@ releases/ # runtime volume data (never in image) volumes/ -docker/volumes/ # OS files .DS_Store diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f596e3f..25d27ea 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -3,6 +3,3 @@ # Workflow changes require maintainer sign-off .github/ @casjaysdevdocker - -# Docker assets -docker/ @casjaysdevdocker diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ebc2101..59242e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: - uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0 with: context: . - file: docker/Dockerfile + file: Dockerfile push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} annotations: ${{ steps.meta.outputs.annotations }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6b0f0e9..6c86195 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,7 +51,7 @@ jobs: - uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0 with: context: . - file: docker/Dockerfile + file: Dockerfile push: true tags: ${{ steps.meta.outputs.tags }} annotations: ${{ steps.meta.outputs.annotations }} diff --git a/.gitignore b/.gitignore index 7b0c3e3..5a1af55 100644 --- a/.gitignore +++ b/.gitignore @@ -56,7 +56,6 @@ default.env # runtime volume data — never committed volumes/ -docker/volumes/ # Claude Code runtime files .claude/settings.local.json diff --git a/docker/Dockerfile b/Dockerfile similarity index 97% rename from docker/Dockerfile rename to Dockerfile index dafba61..536f8ee 100644 --- a/docker/Dockerfile +++ b/Dockerfile @@ -49,10 +49,10 @@ COPY --from=jitsi-source /prosody-plugins-contrib /prosody-plugins-contrib COPY --from=jitsi-source /usr/local/share/lua/5.4 /usr/local/share/lua/5.4 # Copy rootfs overlay (mirrors Linux FHS) -COPY docker/rootfs/ / +COPY rootfs/ / # Copy Dockerfile into image for reference -COPY docker/Dockerfile /root/Dockerfile +COPY Dockerfile /root/Dockerfile # Set ownership and permissions RUN chown -R prosody:prosody /config /prosody-plugins-custom /prosody-plugins-contrib && \ diff --git a/README.md b/README.md index 90740fb..235da05 100644 --- a/README.md +++ b/README.md @@ -38,20 +38,63 @@ casjaysdevdocker/prosody:latest ## via docker-compose ```yaml -version: "2" +# nginx proxy address - http://172.17.0.1:5280 +name: prosody + +x-logging: &logging + driver: json-file + options: + max-size: 10m + max-file: "3" + services: - ProjectName: - image: casjaysdevdocker/prosody - container_name: casjaysdevdocker-prosody - environment: - - TZ=America/New_York - - HOSTNAME=prosody - volumes: - - "/srv/$USER/docker/casjaysdevdocker/prosody/prosody/latest/volumes/data:/data:z" - - "/srv/$USER/docker/casjaysdevdocker/prosody/prosody/latest/volumes/config:/config:z" - ports: - - 80:80 + prosody: + image: ghcr.io/casjaysdevdocker/prosody:latest + pull_policy: always restart: always + logging: *logging + environment: + XMPP_DOMAIN: meet.jitsi + XMPP_AUTH_DOMAIN: auth.meet.jitsi + XMPP_GUEST_DOMAIN: guest.meet.jitsi + XMPP_MUC_DOMAIN: muc.meet.jitsi + XMPP_INTERNAL_MUC_DOMAIN: internal-muc.meet.jitsi + XMPP_HIDDEN_DOMAIN: hidden.meet.jitsi + JICOFO_AUTH_PASSWORD: ${JICOFO_AUTH_PASSWORD:?set in .env} + JVB_AUTH_PASSWORD: ${JVB_AUTH_PASSWORD:?set in .env} + ENABLE_AUTH: "0" + ENABLE_GUESTS: "0" + ENABLE_XMPP_WEBSOCKET: "1" + LOG_LEVEL: info + # internal = local accounts only; openfire = also accept Openfire accounts + ENABLE_REGISTRATION: "0" + AUTH_TYPE: internal + OPENFIRE_AUTH_ENABLED: "0" + OPENFIRE_AUTH_HOST: 172.17.0.1 + OPENFIRE_AUTH_PORT: "5223" + OPENFIRE_AUTH_DOMAIN: "" + OPENFIRE_AUTH_EXCLUDE: focus,jvb,jibri,recorder + volumes: + - ./volumes/config:/config + ports: + - "5222:5222" + - "5280:5280" + - "5347:5347" + networks: + - prosody + healthcheck: + test: ["CMD", "/usr/local/bin/healthcheck.sh"] + interval: 30s + timeout: 10s + retries: 3 + +networks: + prosody: + driver: bridge + enable_ipv6: true + ipam: + config: + - subnet: fd00:5a:30::/64 ``` ## Get source files diff --git a/docker/compose.yml b/docker/compose.yml deleted file mode 100644 index 1b7dcbb..0000000 --- a/docker/compose.yml +++ /dev/null @@ -1,57 +0,0 @@ -# nginx proxy address - http://172.17.0.1:5280 -name: prosody - -x-logging: &logging - driver: json-file - options: - max-size: 10m - max-file: "3" - -services: - prosody: - image: ghcr.io/casjaysdevdocker/prosody:latest - pull_policy: always - restart: always - logging: *logging - environment: - XMPP_DOMAIN: meet.jitsi - XMPP_AUTH_DOMAIN: auth.meet.jitsi - XMPP_GUEST_DOMAIN: guest.meet.jitsi - XMPP_MUC_DOMAIN: muc.meet.jitsi - XMPP_INTERNAL_MUC_DOMAIN: internal-muc.meet.jitsi - XMPP_HIDDEN_DOMAIN: hidden.meet.jitsi - JICOFO_AUTH_PASSWORD: ${JICOFO_AUTH_PASSWORD:?set in .env} - JVB_AUTH_PASSWORD: ${JVB_AUTH_PASSWORD:?set in .env} - ENABLE_AUTH: "0" - ENABLE_GUESTS: "0" - ENABLE_XMPP_WEBSOCKET: "1" - LOG_LEVEL: info - # internal = local accounts only; openfire = also accept Openfire accounts - ENABLE_REGISTRATION: "0" - AUTH_TYPE: internal - OPENFIRE_AUTH_ENABLED: "0" - OPENFIRE_AUTH_HOST: 172.17.0.1 - OPENFIRE_AUTH_PORT: "5223" - OPENFIRE_AUTH_DOMAIN: "" - OPENFIRE_AUTH_EXCLUDE: focus,jvb,jibri,recorder - volumes: - - ./volumes/config:/config - ports: - - "5222:5222" - - "5280:5280" - - "5347:5347" - networks: - - prosody - healthcheck: - test: ["CMD", "/usr/local/bin/healthcheck.sh"] - interval: 30s - timeout: 10s - retries: 3 - -networks: - prosody: - driver: bridge - enable_ipv6: true - ipam: - config: - - subnet: fd00:5a:30::/64 diff --git a/docker/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh similarity index 100% rename from docker/rootfs/usr/local/bin/entrypoint.sh rename to rootfs/usr/local/bin/entrypoint.sh diff --git a/docker/rootfs/usr/local/bin/healthcheck.sh b/rootfs/usr/local/bin/healthcheck.sh similarity index 100% rename from docker/rootfs/usr/local/bin/healthcheck.sh rename to rootfs/usr/local/bin/healthcheck.sh diff --git a/docker/rootfs/usr/local/share/prosody-plugins/mod_auth_openfire_hybrid.lua b/rootfs/usr/local/share/prosody-plugins/mod_auth_openfire_hybrid.lua similarity index 100% rename from docker/rootfs/usr/local/share/prosody-plugins/mod_auth_openfire_hybrid.lua rename to rootfs/usr/local/share/prosody-plugins/mod_auth_openfire_hybrid.lua diff --git a/docker/rootfs/usr/local/share/prosody-plugins/mod_user_api.lua b/rootfs/usr/local/share/prosody-plugins/mod_user_api.lua similarity index 100% rename from docker/rootfs/usr/local/share/prosody-plugins/mod_user_api.lua rename to rootfs/usr/local/share/prosody-plugins/mod_user_api.lua