diff --git a/.gitea/workflows/server-docker-build.yml b/.gitea/workflows/server-docker-build.yml index 0b52425..28fb4a2 100644 --- a/.gitea/workflows/server-docker-build.yml +++ b/.gitea/workflows/server-docker-build.yml @@ -17,15 +17,10 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Log in to local Gitea Container Registry + - name: Log in to Gitea Container Registry uses: docker/login-action@v3 with: - # Pushed here instead of git.thumeit.com (still the source repo, - # just not the image registry anymore) -- since whiteboard mode - # added Node + native resvg bindings, the image grew past - # Cloudflare's payload-size limit in front of that host and - # every push 413'd. This LAN address has nothing in front of it. - registry: 10.0.0.246:3000 + registry: git.thumeit.com username: tfaour password: ${{ secrets.REGISTRY_TOKEN }} @@ -35,5 +30,5 @@ jobs: context: ./server push: true tags: | - 10.0.0.246:3000/tfaour/espresso-frame-server:latest - 10.0.0.246:3000/tfaour/espresso-frame-server:${{ gitea.sha }} + git.thumeit.com/tfaour/espresso-frame-server:latest + git.thumeit.com/tfaour/espresso-frame-server:${{ gitea.sha }} diff --git a/server/README.md b/server/README.md index 382e13c..d76df26 100644 --- a/server/README.md +++ b/server/README.md @@ -277,17 +277,11 @@ Pages: `/` (routing hub), `/setup`, `/login`, `/claim`, `/settings`, Every push to `main` that touches `server/` triggers a Gitea Actions workflow (`.gitea/workflows/server-docker-build.yml`) that builds this -image and pushes it to a LAN-local Gitea Container Registry at -`10.0.0.246:3000/tfaour/espresso-frame-server` -- not the `git.thumeit.com` -source repo itself; Cloudflare (fronting that host) started rejecting -pushes with 413 Payload Too Large once whiteboard mode's Node/native- -binding layers made the image significantly bigger, and this address -has nothing in front of it to hit that limit. A deploy host reaching -this registry needs Docker's `insecure-registries` configured for it if -it's plain HTTP (see `daemon.json`) -- not something this repo controls. -`docker-compose.yml` (copied from `docker-compose.yml.example`, see -Setup above) already points at that image, so a deploy host doesn't -need this repo's build context at all -- just the compose file: +image and pushes it to this repo's Gitea Container Registry at +`git.thumeit.com/tfaour/espresso-frame-server`. `docker-compose.yml` +(copied from `docker-compose.yml.example`, see Setup above) already +points at that image, so a deploy host doesn't need this repo's build +context at all -- just the compose file: ``` docker compose pull diff --git a/server/docker-compose.yml.example b/server/docker-compose.yml.example index 4393be0..07e4f5a 100644 --- a/server/docker-compose.yml.example +++ b/server/docker-compose.yml.example @@ -1,11 +1,6 @@ services: espresso-frame-server: - # Pushed to a LAN-local registry, not git.thumeit.com -- see - # .gitea/workflows/server-docker-build.yml's comment (Cloudflare's - # payload-size limit in front of that host started rejecting pushes - # once whiteboard mode's Node/native-binding layers made the image - # much bigger). - image: 10.0.0.246:3000/tfaour/espresso-frame-server:latest + image: git.thumeit.com/tfaour/espresso-frame-server:latest build: . ports: - "8420:8420"