Merge branch 'main' into dependabot/pip/setuptools-70.0.0

emfcamp · Aug 20, 2024 · 7538970 · 7538970
2 parents 9f685bf + 93eef5f
commit 7538970
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 34 deletions.
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
@@ -12,6 +12,8 @@ on:
       - 'docker/Dockerfile.base-dev.dockerignore'
       - 'pyproject.toml'
       - 'poetry.lock'
+      - 'package.json'
+      - 'package-lock.json'
   schedule:
     - cron:  '30 5 */14 * *'
 

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -20,12 +20,10 @@ jobs:
       COVERALLS_GIT_BRANCH: ${{ github.ref }}
     steps:
       - uses: actions/checkout@v4
-      - name: Fetch latest docker-compose
-        run: sudo curl -L "https://github.com/docker/compose/releases/download/1.25.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
       - name: Build containers
-        run: docker-compose -f ./docker-compose.yml -f ./docker-compose.ci.yml build --parallel
+        run: docker compose -f ./docker-compose.yml -f ./docker-compose.ci.yml build --parallel
       - name: Test
-        run: docker-compose -f ./docker-compose.yml -f ./docker-compose.ci.yml run -T app poetry run make test
+        run: docker compose -f ./docker-compose.yml -f ./docker-compose.ci.yml run -T app poetry run make test
   build:
     runs-on: ubuntu-latest
     needs: test
@@ -39,9 +37,11 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build app image
         run: docker build -t ghcr.io/emfcamp/website:latest -f ./Dockerfile.prod .
-      - name: Publish app image
-        run: docker push ghcr.io/emfcamp/website:latest
       - name: Build static image
+        # This builds from ghcr.io/emfcamp/website:latest, which we haven't pushed yet but should be correct locally
         run: docker build -t ghcr.io/emfcamp/website-static:latest -f ./docker/static/Dockerfile ./docker/static/
       - name: Publish static image
+        # Push static first so it hopefully gets pulled first
         run: docker push ghcr.io/emfcamp/website-static:latest
+      - name: Publish app image
+        run: docker push ghcr.io/emfcamp/website:latest
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -14,9 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Fetch latest docker-compose
-        run: sudo curl -L "https://github.com/docker/compose/releases/download/1.25.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
       - name: Build containers
-        run: docker-compose -f ./docker-compose.yml -f ./docker-compose.ci.yml build --parallel
+        run: docker compose -f ./docker-compose.yml -f ./docker-compose.ci.yml build --parallel
       - name: Test
-        run: docker-compose -f ./docker-compose.yml -f ./docker-compose.ci.yml run -T app poetry run make test
+        run: docker compose -f ./docker-compose.yml -f ./docker-compose.ci.yml run -T app poetry run make test
diff --git a/apps/volunteer/data/roles/kitchen_assistant.yml b/apps/volunteer/data/roles/kitchen_assistant.yml
@@ -1,8 +1,8 @@
 name: Kitchen Assistant
-description: Help our excellent catering team provide food for all the volunteers.
+description: Help provide food for all the volunteers.
 full_description_md: |
-  Help our excellent catering team provide food for all the volunteers.
+  Help in our excellent volunteer kitchen to provide food for all the volunteers.
   
-  Mostly you'll be chopping vegetables, washing up, and serving food, the catering team will handle the actual cooking.
+  Mostly you'll be chopping vegetables, washing up, and serving food.
 
   Bonus: Kitchen roles get an additional meal for the shift they work!
diff --git a/docker-compose.kelvin.yml b/docker-compose.kelvin.yml
@@ -27,7 +27,7 @@ services:
     networks:
       - emfweb
 
-  postgres_exporter:
+  postgres-exporter:
     restart: unless-stopped
     image: 'wrouesnel/postgres_exporter:v0.8.0'
     environment:

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -32,7 +32,7 @@ services:
     networks:
       - emfweb
 
-  postgres_exporter:
+  postgres-exporter:
     restart: unless-stopped
     image: 'wrouesnel/postgres_exporter:v0.8.0'
     environment:
@@ -49,7 +49,7 @@ services:
       - emfweb
     command: memcached -m 64
 
-  memcached_exporter:
+  memcached-exporter:
     restart: unless-stopped
     image: 'prom/memcached-exporter:v0.9.0'
     depends_on:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,8 +14,6 @@ services:
       - "2342:2342"
     environment:
       SETTINGS_FILE: ./config/development.cfg
-      FLASK_APP: dev_server.py
-      FLASK_ENV: development
       COLORIZE_LOGS: always
       PYTHONUNBUFFERED: 1
       IRCCAT: fakeirccat:12345

diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
@@ -12,21 +12,21 @@ COPY pyproject.toml poetry.lock /app/
 # doesn't confuse poetry.
 ENV POETRY_VIRTUALENVS_IN_PROJECT=false
 
-# All the X11 packages are required for chromium/playwright which we use for
-# generating PDFs.
-#
 # It would be nice to be able to build an image without build tools and dev
 # packages, however this complicates upgrading packages which require compilation.
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
       libxml2-dev libxslt1-dev libffi-dev git glpk-utils \
       postgresql-client make build-essential libpq-dev \
-      libx11-xcb1 libxcomposite1 libxss1 \
-      libxcursor1 libxdamage1 libxi6 libxtst6 libnss3 libcups2 \
-      libxrandr2 libasound2 libatk1.0-0 libatk-bridge2.0-0 libgtk-3-0 libzbar0 \
-      coinor-cbc curl && \
-    pip3 install poetry==1.7.1 && \
-    poetry install && \
-    poetry run playwright install-deps && \
-    poetry run playwright install chromium && \
+      libzbar0 coinor-cbc curl && \
     rm -rf /var/lib/apt/lists/*
+
+RUN pip3 install poetry==1.7.1 && \
+    poetry install
+
+RUN poetry run playwright install-deps && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN poetry run playwright install chromium && \
+    rm -rf /var/lib/apt/lists/*
+
diff --git a/exports/2022/public/schedule.json b/exports/2022/public/schedule.json
@@ -5543,7 +5543,10 @@
     "source": "database",
     "link": "https://www.emfcamp.org/schedule/2022/353-the-atomic-gardener",
     "start_time": "15:00",
-    "end_time": "15:30"
+    "end_time": "15:30",
+    "video": {
+        "youtube": "https://www.youtube.com/watch?v=-ouMGoQ4HYU"
+    }
   },
   {
     "id": 354,

diff --git a/gulpfile.js b/gulpfile.js
@@ -136,14 +136,14 @@ function css(cb) {
 
 function icons(cb) {
   pump([
-    gulp.src('./images/**/*'),
+    gulp.src('./images/**/*', { encoding: false }),
     gulp.dest('static/images'),
   ], cb);
 }
 
 function images(cb) {
   pump([
-    gulp.src('./node_modules/@primer/octicons/build/svg/**/*.svg'),
+    gulp.src('./node_modules/@primer/octicons/build/svg/**/*.svg', { encoding: false }),
     gulp.dest('static/icons'),
   ], cb);
 }

diff --git a/templates/schedule/historic/item.html b/templates/schedule/historic/item.html
@@ -60,8 +60,19 @@ <h3>Video</h3>
           <button class="youtube-wait-for-click-button">Continue</button>
         </div>
       </div>
-      <p>View this video <a href="{{ event.video.youtube }}">on YouTube</a>.</p>
     {% endif %}
+    <strong>Video Hosts:</strong>
+    <ul>
+    {% if event.video.ccc %}
+      <li>View this video <a href="{{ event.video.ccc }}">on media.ccc.de</a>.</li>
+    {% endif %}
+    {% if event.video.archiveorg %}
+      <li>View this video <a href="{{ event.video.archiveorg }}">on the Internet Archive</a>.</li>
+    {% endif %}
+    {% if event.video.youtube %}
+      <li>View this video <a href="{{ event.video.youtube }}">on YouTube</a>.</li>
+    {% endif %}
+    </ul>
   </div>
 {% endif %}
 {% endblock %}
diff --git a/templates/schedule/item.html b/templates/schedule/item.html
@@ -135,8 +135,16 @@ <h4>Video</h4>
     <iframe src="{{proposal.youtube_url|replace('youtube.com/watch?v=', 'youtube.com/embed/')}}"
         width="100%" height="500px" frameborder="0" 
         allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-    <p>View this video <a href="{{ proposal.youtube_url }}">on YouTube</a>.</p>
   {% endif %}
+  <strong>Video Hosts:</strong>
+  <ul>
+  {% if proposal.c3voc_url %}
+    <li>View this video <a href="{{ proposal.c3voc_url }}">on media.ccc.de</a>.</li>
+  {% endif %}
+  {% if proposal.youtube_url %}
+    <li>View this video <a href="{{ proposal.youtube_url }}">on YouTube</a>.</li>
+  {% endif %}
+  </ul>
 </div>
 <p>&nbsp;</p>
 {% endif %}