Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPC-9255: Fix issue with gin sidebar toggle #764

Merged
merged 13 commits into from
Oct 25, 2023
+52 −454
Merged

HPC-9255: Fix issue with gin sidebar toggle #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ec377ca
HPC-9255: Fix issue with gin sidebar toggle
berliner Oct 24, 2023
b502a7f
HPC-9255: Bump to PHP 8.2
berliner Oct 24, 2023
f63d495
HPC-9255: Bump to PHP 8.2
berliner Oct 24, 2023
c24da0c
chore: Bump Elastic APM to a version that will work with PHP 8.2
cafuego Oct 25, 2023
16e68d1
chore: Remove unneeded custom config that is now default in PHP 8.2 i…
cafuego Oct 25, 2023
2a5f128
chore: Apply the RW and UNO mapbox fixes to prevent IP caching and to…
cafuego Oct 25, 2023
4c1e5c8
chore: Update the workflows.
cafuego Oct 25, 2023
640ffab
chore: Fix-update settings.php.
cafuego Oct 25, 2023
d706184
chore: Oh, and use our MariaDB 10.11 image for tests.
cafuego Oct 25, 2023
f54ed4c
fix: Oh dear.
cafuego Oct 25, 2023
deb4594
Merge pull request #765 from UN-OCHA/cafuego-patch-1
berliner Oct 25, 2023
7aac9a5
HPC-9255: Bump local php version
berliner Oct 25, 2023
bf00590
HPC-9255: Fix tests
berliner Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .docksal/docksal.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DOCKSAL_STACK=default
DOCROOT=html
DB_IMAGE="docksal/mysql:8.0-2.0"
CLI_IMAGE="docksal/cli:php8.1-3.2"
CLI_IMAGE="docksal/cli:php8.2"
4 changes: 2 additions & 2 deletions .github/tests/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -73,4 +73,4 @@ services:
ports:
- "8081:80"
networks:
- default
- default
1 change: 1 addition & 0 deletions .github/workflows/composer-update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Run Composer Update
on:
schedule:
- cron: '40 7 * * 4'
workflow_dispatch:

jobs:
build:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Run tests

on: [pull_request]

jobs:
tests:
runs-on: ubuntu-latest
Expand All @@ -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:
Expand Down
14 changes: 6 additions & 8 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the code.
FROM public.ecr.aws/unocha/unified-builder:8.1-stable as builder
FROM public.ecr.aws/unocha/php-k8s:8.2-stable as builder

ARG BRANCH_ENVIRONMENT
ENV NODE_ENV=$BRANCH_ENVIRONMENT
Expand All @@ -21,7 +21,7 @@ RUN mkdir -m 0775 -p html/sites/default && \
################################################################################

# Generate the image.
FROM public.ecr.aws/unocha/php-k8s:8.1-stable
FROM public.ecr.aws/unocha/php-k8s:8.2-stable

ARG VCS_REF
ARG VCS_URL
Expand Down Expand Up @@ -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
Loading
Loading