From a12df35e5668c2da5d0d91d19411ecb46043160c Mon Sep 17 00:00:00 2001 From: Bas Date: Thu, 9 Jan 2025 14:37:43 +0100 Subject: [PATCH] f --- .github/workflows/run-cypress.yml | 6 +++--- .github/workflows/test-integration.yml | 12 ++++++------ docker/{php-fpm => ci}/Dockerfile-php72 | 6 ++---- docker/{php-fpm => ci}/Dockerfile-php82 | 6 ++---- docker/{php-fpm => ci}/apache2.conf | 0 docker/{php-fpm => ci}/app.ini | 0 docker/docker-compose-php72.yml | 4 ++-- docker/docker-compose-php82.yml | 4 ++-- docker/docker-compose.yml | 10 ++-------- theme/README.md | 2 +- 10 files changed, 20 insertions(+), 30 deletions(-) rename docker/{php-fpm => ci}/Dockerfile-php72 (59%) rename docker/{php-fpm => ci}/Dockerfile-php82 (52%) rename docker/{php-fpm => ci}/apache2.conf (100%) rename docker/{php-fpm => ci}/app.ini (100%) diff --git a/.github/workflows/run-cypress.yml b/.github/workflows/run-cypress.yml index 877068dc5a..33f4efb7e2 100644 --- a/.github/workflows/run-cypress.yml +++ b/.github/workflows/run-cypress.yml @@ -29,7 +29,7 @@ jobs: run: | cd docker && ${DOCKER_COMPOSE} up -d --build && - docker compose exec -T --user www-data php-fpm.dev.openconext.local bash -c ' + docker compose exec -T --user www-data engine.dev.openconext.local bash -c ' SYMFONY_ENV=ci composer install --prefer-dist -n -o --ignore-platform-reqs && \ ./app/console cache:clear --env=ci && \ cd theme && CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile && EB_THEME=skeune yarn build @@ -38,13 +38,13 @@ jobs: if: always() run: | cd docker && \ - docker compose exec -T --user www-data php-fpm.dev.openconext.local bash -c ' + docker compose exec -T --user www-data engine.dev.openconext.local bash -c ' EB_THEME=skeune ./theme/scripts/prepare-test.js ' && \ docker compose exec -T cypress bash -c ' cd e2e && yarn install && cypress run --spec cypress/integration/skeune/**/*.spec.js,cypress/integration/shared/*.spec.js --browser=chrome --headless ' && \ - docker compose exec -T --user www-data php-fpm.dev.openconext.local bash -c ' + docker compose exec -T --user www-data engine.dev.openconext.local bash -c ' EB_THEME=openconext ./theme/scripts/prepare-test.js ' && \ docker compose exec -T cypress bash -c ' diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 5c0d425cd9..fa790b6254 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -29,7 +29,7 @@ jobs: run: | cd docker && ${DOCKER_COMPOSE} up -d --build && - docker compose exec -T --user www-data php-fpm.dev.openconext.local bash -c ' + docker compose exec -T --user www-data engine.dev.openconext.local bash -c ' SYMFONY_ENV=ci composer install --prefer-dist -n -o --ignore-platform-reqs && \ ./app/console cache:clear --env=ci && \ cd theme && CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile && EB_THEME=skeune yarn build @@ -37,7 +37,7 @@ jobs: - name: Run code quality tests if: always() run: | - cd docker && docker compose exec -T --user www-data php-fpm.dev.openconext.local bash -c ' + cd docker && docker compose exec -T --user www-data engine.dev.openconext.local bash -c ' echo -e "\nPHP Mess Detector\n" && \ ./vendor/bin/phpmd src text ci/qa-config/phpmd.xml --exclude */Tests/* && \ echo -e "\nPHP CodeSniffer\n" && \ @@ -52,7 +52,7 @@ jobs: - name: Run unit tests if: always() run: | - cd docker && APP_ENV=ci SYMFONY_ENV=ci docker compose exec -T --user www-data php-fpm.dev.openconext.local bash -c ' + cd docker && APP_ENV=ci SYMFONY_ENV=ci docker compose exec -T --user www-data engine.dev.openconext.local bash -c ' echo -e "\nInstalling database fixtures...\n" && \ ./app/console doctrine:schema:drop --force --env=ci && \ ./app/console doctrine:schema:create --env=ci && \ @@ -70,7 +70,7 @@ jobs: - name: Run acceptance tests if: always() run: | - cd docker && docker compose exec -T --user www-data php-fpm.dev.openconext.local bash -c ' + cd docker && docker compose exec -T --user www-data engine.dev.openconext.local bash -c ' echo -e "\nInstalling database fixtures...\n" && \ ./app/console doctrine:schema:drop --force --env=ci && \ ./app/console doctrine:schema:create --env=ci && \ @@ -86,7 +86,7 @@ jobs: - name: Run linting tests if: always() run: | - cd docker && docker compose exec -T --user www-data php-fpm.dev.openconext.local bash -c ' + cd docker && docker compose exec -T --user www-data engine.dev.openconext.local bash -c ' echo -e "\nTwig lint\n" && \ app/console lint:twig theme/ && \ cd theme && \ @@ -98,7 +98,7 @@ jobs: - name: Show log on failure if: failure() run: | - cd docker && docker compose exec -T php-fpm.dev.openconext.local cat /var/www/html/app/logs/ci/ci.log + cd docker && docker compose exec -T engine.dev.openconext.local cat /var/www/html/app/logs/ci/ci.log - name: Send notification on production build nightly build failure uses: sonots/slack-notice-action@v3 with: diff --git a/docker/php-fpm/Dockerfile-php72 b/docker/ci/Dockerfile-php72 similarity index 59% rename from docker/php-fpm/Dockerfile-php72 rename to docker/ci/Dockerfile-php72 index fbe690d366..43af768db9 100644 --- a/docker/php-fpm/Dockerfile-php72 +++ b/docker/ci/Dockerfile-php72 @@ -1,14 +1,12 @@ FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2-node16-composer2:latest RUN a2enmod ssl # Copy phpfpm config -COPY docker/php-fpm/app.ini /usr/local/etc/php/conf.d/ +COPY docker/ci/app.ini /usr/local/etc/php/conf.d/ RUN rm -rf /etc/apache2/sites-enabled/* -COPY docker/php-fpm/apache2.conf /etc/apache2/sites-enabled/ +COPY docker/ci/apache2.conf /etc/apache2/sites-enabled/ RUN chown -R www-data: /var/www/ WORKDIR /var/www/html -# Copy keys and config -COPY ci/qa-config/files/ /etc/openconext EXPOSE 443 CMD ["apache2-foreground"] diff --git a/docker/php-fpm/Dockerfile-php82 b/docker/ci/Dockerfile-php82 similarity index 52% rename from docker/php-fpm/Dockerfile-php82 rename to docker/ci/Dockerfile-php82 index 9ab7a436db..498a95c247 100644 --- a/docker/php-fpm/Dockerfile-php82 +++ b/docker/ci/Dockerfile-php82 @@ -3,13 +3,11 @@ FROM ghcr.io/openconext/openconext-basecontainers/php82-apache2-node16-composer2 RUN a2enmod ssl -COPY docker/php-fpm/app.ini /usr/local/etc/php/conf.d/ -COPY docker/php-fpm/apache2.conf /etc/apache2/sites-enabled/ +COPY docker/ci/app.ini /usr/local/etc/php/conf.d/ +COPY docker/ci/apache2.conf /etc/apache2/sites-enabled/ RUN chown -R www-data: /var/www/ WORKDIR /var/www/html -# Copy keys and config -COPY ci/qa-config/files/ /etc/openconext EXPOSE 443 CMD ["apache2-foreground"] diff --git a/docker/php-fpm/apache2.conf b/docker/ci/apache2.conf similarity index 100% rename from docker/php-fpm/apache2.conf rename to docker/ci/apache2.conf diff --git a/docker/php-fpm/app.ini b/docker/ci/app.ini similarity index 100% rename from docker/php-fpm/app.ini rename to docker/ci/app.ini diff --git a/docker/docker-compose-php72.yml b/docker/docker-compose-php72.yml index bfee17ab04..9257fdf3d1 100644 --- a/docker/docker-compose-php72.yml +++ b/docker/docker-compose-php72.yml @@ -1,6 +1,6 @@ version: '2.4' services: - php-fpm.dev.openconext.local: + engine.dev.openconext.local: build: - dockerfile: docker/php-fpm/Dockerfile-php72 + dockerfile: docker/ci/Dockerfile-php72 diff --git a/docker/docker-compose-php82.yml b/docker/docker-compose-php82.yml index a8065adf2d..e5457a8d54 100644 --- a/docker/docker-compose-php82.yml +++ b/docker/docker-compose-php82.yml @@ -1,6 +1,6 @@ version: '2.4' services: - php-fpm.dev.openconext.local: + engine.dev.openconext.local: build: - dockerfile: docker/php-fpm/Dockerfile-php82 + dockerfile: docker/ci/Dockerfile-php82 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 79a231ef7b..be1bbfa948 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -37,11 +37,11 @@ services: retries: 20 interval: 2s - php-fpm.dev.openconext.local: + engine.dev.openconext.local: build: context: ../ # override this in a dedicated dockerfile per php version - # dockerfile: docker/php-fpm/Dockerfile + # dockerfile: docker/ci/Dockerfile container_name: eb-phpfpm volumes: - ../:/var/www/html @@ -52,15 +52,9 @@ services: condition: service_healthy db-test.dev.openconext.local: condition: service_healthy - extra_hosts: - - 'engine.dev.openconext.local: 127.0.0.1' environment: APP_ENV: ci SYMFONY_ENV: ci - networks: - default: - aliases: - - engine.dev.openconext.local selenium.dev.openconext.local: image: selenium/standalone-chrome:2.53.1 diff --git a/theme/README.md b/theme/README.md index 40957e8116..4d33318475 100644 --- a/theme/README.md +++ b/theme/README.md @@ -91,7 +91,7 @@ This script changes the Twig theme and builds the chosen frontend theme assets. $ EB_THEME=skeune ./scripts/prepare-test.js ``` -The script must be run on the php-fpm instance on your CI environment as it also clears the application cache in order to let the correct Twig templates to be included in the cache. +The script must be run on the engine instance on your CI environment as it also clears the application cache in order to let the correct Twig templates to be included in the cache. ### Writing your own custom theme: