diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index dd15bfb..fe5a699 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -13,9 +13,10 @@ jobs: run: | echo "${{ secrets.DOCKER_PASSWORD }}" | podman login git.interhacker.space --username "${{ secrets.DOCKER_USERNAME }}" --password-stdin - - name: Build and Push Container Image + - name: Build Container Image run: | - trap 'rm -f dist.zip' EXIT - wget -q -O dist.zip https://git.interhacker.space/epickiwi/2026.camp.carte/releases/download/latest/dist.zip podman build -t git.interhacker.space/interhack/camp-website-2026:latest . + + - name: Push Container Image + run: | podman push git.interhacker.space/interhack/camp-website-2026:latest diff --git a/.gitignore b/.gitignore index 01550dd..b936b79 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ guide.html -dist.zip diff --git a/Dockerfile b/Dockerfile index c95570d..5482b4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,13 @@ FROM docker.io/nginx:1.29-alpine -RUN apk add --update --no-cache unzip bash pandoc sed +RUN apk add --update --no-cache wget unzip bash pandoc sed -COPY dist.zip /tmp/dist.zip -RUN unzip -q /tmp/dist.zip -d /tmp/carte +RUN wget -q https://git.interhacker.space/epickiwi/2026.camp.carte/releases/download/latest/dist.zip +RUN unzip -q dist.zip -d /tmp/carte RUN mkdir -p /usr/share/nginx/html/carte RUN cp -r /tmp/carte/dist/* /usr/share/nginx/html/carte/ -RUN rm -rf /tmp/carte /tmp/dist.zip +RUN rm -rf /tmp/carte +RUN rm -rf dist.zip COPY guide.template.html . COPY update-guide.sh . diff --git a/README.md b/README.md index 829992a..9bd2043 100644 --- a/README.md +++ b/README.md @@ -40,13 +40,11 @@ First, login to the Docker registry: docker login git.interhacker.space ``` -Then, download the map bundle, build and push to the registry: +Then, build and push to the registry: ```bash -wget -q -O dist.zip https://git.interhacker.space/epickiwi/2026.camp.carte/releases/download/latest/dist.zip docker build -t git.interhacker.space/interhack/camp-website-2026:latest . docker push git.interhacker.space/interhack/camp-website-2026:latest -rm -f dist.zip ``` The pull process is triggered every five minutes. diff --git a/manual-ci.sh b/manual-ci.sh deleted file mode 100755 index bc0fb30..0000000 --- a/manual-ci.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -IMAGE="git.interhacker.space/interhack/camp-website-2026:latest" -REGISTRY="git.interhacker.space" - -need_cmd() { - command -v "$1" >/dev/null 2>&1 || { - echo "Missing required command: $1" >&2 - exit 1 - } -} - -need_cmd bash -need_cmd wget -need_cmd pandoc -need_cmd docker - -if [[ ! -x ./update-guide.sh ]]; then - echo "Missing or non-executable ./update-guide.sh" >&2 - exit 1 -fi - -echo "==> Generating guide.html" -bash ./update-guide.sh - -trap 'rm -f dist.zip' EXIT - -echo "==> Downloading map bundle" -wget -q -O dist.zip https://git.interhacker.space/epickiwi/2026.camp.carte/releases/download/latest/dist.zip - -echo "==> Logging in to ${REGISTRY}" -if [[ -n "${DOCKER_USERNAME:-}" && -n "${DOCKER_PASSWORD:-}" ]]; then - printf '%s' "$DOCKER_PASSWORD" | docker login "$REGISTRY" --username "$DOCKER_USERNAME" --password-stdin -else - docker login "$REGISTRY" -fi - -echo "==> Building image: ${IMAGE}" -docker build --no-cache -t "$IMAGE" . - -echo "==> Pushing image: ${IMAGE}" -docker push "$IMAGE" - -rm -f dist.zip - -echo "Done."