Merge pull request #765 from UN-OCHA/cafuego-patch-1

chore: Update various bits to ensure PHP 8.2 builds work.

.github/tests/docker-compose.yml

@@ -22,7 +22,7 @@ services:
       - default
 
   mysql:
-    image: public.ecr.aws/unocha/mysql:10.6
+    image: public.ecr.aws/unocha/mysql:10.11
     hostname: ghi-test-mysql
     container_name: ghi-test-mysql
     environment:
@@ -73,4 +73,4 @@ services:
     ports:
     - "8081:80"
     networks:
-      - default
+      - default

.github/workflows/composer-update.yml

@@ -3,6 +3,7 @@ name: Run Composer Update
 on:
   schedule:
     - cron: '40 7 * * 4'
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/run-tests.yml

@@ -1,7 +1,7 @@
 name: Run tests
 
 on: [pull_request]
-  
+
 jobs:
   tests:
     runs-on: ubuntu-latest
@@ -11,19 +11,19 @@ jobs:
       pull-requests: write 
       actions: read 
       statuses: write 
-  
+
     steps:
       - name: Checkout Code
         id: checkout
         uses: actions/checkout@v3
-        
+
       - name: Extract PHP Version
         id: php
         uses: docker://ghcr.io/un-ocha/actions:extract-php-version-main
         with:
           docker_file: 'docker/Dockerfile'
           docker_image: 'public.ecr.aws/unocha/php-k8s'
-          
+
       - name: Setup PHP with PECL extension
         uses: shivammathur/setup-php@v2
         with:

docker/Dockerfile

@@ -58,13 +58,11 @@ COPY --from=builder /srv/www/composer.patches.json /srv/www/composer.patches.jso
 COPY --from=builder /srv/www/composer.lock /srv/www/composer.lock
 COPY --from=builder /srv/www/patches /srv/www/patches
 COPY --from=builder /srv/www/scripts /srv/www/scripts
-COPY --from=builder /srv/www/docker/etc/nginx/apps/drupal/fastcgi_drupal.conf /etc/nginx/apps/drupal/fastcgi_drupal.conf
-COPY --from=builder /srv/www/docker/etc/nginx/apps/drupal/drupal.conf /etc/nginx/apps/drupal/drupal.conf
 COPY --from=builder /srv/www/docker/etc/nginx/custom /etc/nginx/custom/
 COPY --from=builder /srv/www/docker/etc/nginx/sites-enabled/02_mapbox_proxy_cache.conf /etc/nginx/sites-enabled/02_mapbox_proxy_cache.conf
 COPY --from=builder /srv/www/docker/99-elastic-apm-custom.ini /tmp/99-elastic-apm-custom.ini
 
-RUN  curl -L -o /tmp/apm-agent-php_1.6.1_all.apk https://github.com/elastic/apm-agent-php/releases/download/v1.6.1/apm-agent-php_1.6.1_all.apk && \
-     apk add --allow-untrusted /tmp/apm-agent-php_1.6.1_all.apk && \
-     rm -f /tmp/apm-agent-php_1.6.1_all.apk && \
-     mv -f /tmp/99-elastic-apm-custom.ini /etc/php81/conf.d/99-elastic-apm-custom.ini
+RUN  curl -L -o /tmp/apm-agent-php_all.apk https://github.com/elastic/apm-agent-php/releases/download/v1.10.0/apm-agent-php_1.10.0_all.apk && \
+     apk add --allow-untrusted /tmp/apm-agent-php_all.apk && \
+     rm -f /tmp/apm-agent-php_all.apk && \
+     mv -f /tmp/99-elastic-apm-custom.ini /etc/php82/conf.d/99-elastic-apm-custom.ini