diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 1467c91..dd15bfb 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -1,4 +1,7 @@ -on: [push] +on: + push: + branches: + - main jobs: build: runs-on: docker @@ -6,27 +9,13 @@ 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 Container Image + - name: Build and Push 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 b936b79..01550dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ guide.html +dist.zip diff --git a/Dockerfile b/Dockerfile index 818cbb7..c95570d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,19 @@ 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 9bd2043..829992a 100644 --- a/README.md +++ b/README.md @@ -40,11 +40,13 @@ First, login to the Docker registry: docker login git.interhacker.space ``` -Then, build and push to the registry: +Then, download the map bundle, 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 new file mode 100644 index 0000000..a45f416 --- /dev/null +++ b/assets/pause-solid-full.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/play-solid-full.svg b/assets/play-solid-full.svg new file mode 100644 index 0000000..460cdbb --- /dev/null +++ b/assets/play-solid-full.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/contact.html b/contact.html index 789749b..4711ae8 100644 --- a/contact.html +++ b/contact.html @@ -17,6 +17,7 @@ maison guide programme + carte poster contact diff --git a/css/home.css b/css/home.css index 0ad352d..d6b71ec 100644 --- a/css/home.css +++ b/css/home.css @@ -157,3 +157,26 @@ font-size : 1.5em; 50% { background-position: 100% 50%; } 100% { background-position: 0% 50%; } } + +/* Radio Interhack */ + +#radio-player { + float: left; + z-index: 100000; + background-color: aqua; + height: 1em; + width: 1em; + position: absolute; + bottom: 1em; + right: 1em; + position: fixed; + border-radius: 10%; +} + +#radio-button { + background: none; + display: flex; + justify-content: center; + align-items: center; + border: none; +} \ No newline at end of file diff --git a/guide.template.html b/guide.template.html index 3de6d83..f9c73ec 100644 --- a/guide.template.html +++ b/guide.template.html @@ -23,6 +23,7 @@ BISOUS maison guide programme + carte poster contact diff --git a/index.html b/index.html index a12c381..c96aa04 100644 --- a/index.html +++ b/index.html @@ -10,6 +10,7 @@ +
C'est complet !
-
+
Nous avons reçu en amont
des dons dont nous avons besoin.
- +
- Merci !!
-
+ Merci !!
+
Et nous comptons sur vous pour continuer à vous mobiliser avant et durant le camp, pour que l'on puisse atteindre les 100% !
et bien d'autres !
Rejoignez le canal Matrix sur #interhack:matrix.interhacker.space