diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index dd15bfb..1467c91 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -1,7 +1,4 @@ -on: - push: - branches: - - main +on: [push] jobs: build: runs-on: docker @@ -9,13 +6,27 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Install Pandoc + run: | + apt-get update + apt-get install -y pandoc + + - name: Generate guide.html + run: bash update-guide.sh + + - name: Install Podman + run: | + apt-get update + apt-get install -y podman + - name: Podman Login 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..818cbb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,6 @@ FROM docker.io/nginx:1.29-alpine -RUN apk add --update --no-cache unzip bash pandoc sed - -COPY dist.zip /tmp/dist.zip -RUN unzip -q /tmp/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 - -COPY guide.template.html . -COPY update-guide.sh . -RUN bash update-guide.sh - COPY *.html /usr/share/nginx/html -RUN mv guide.html /usr/share/nginx/html COPY assets /usr/share/nginx/html/assets COPY css /usr/share/nginx/html/css COPY js /usr/share/nginx/html/js 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/assets/pause-solid-full.svg b/assets/pause-solid-full.svg deleted file mode 100644 index a45f416..0000000 --- a/assets/pause-solid-full.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/play-solid-full.svg b/assets/play-solid-full.svg deleted file mode 100644 index 460cdbb..0000000 --- a/assets/play-solid-full.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/reglement-charte.pdf b/assets/reglement-charte.pdf deleted file mode 100755 index ceb24d5..0000000 Binary files a/assets/reglement-charte.pdf and /dev/null differ diff --git a/contact.html b/contact.html index 4711ae8..82aa18d 100644 --- a/contact.html +++ b/contact.html @@ -17,7 +17,6 @@ maison guide programme - carte poster contact @@ -42,15 +41,14 @@

Matrix :

- #camp-space:matrix.interhacker.space + #interhack:matrix.interhacker.space