GHA: Fix integration test by removing the default apache config before

applying our own
OpenConext · Nov 20, 2023 · f7e664d · f7e664d
1 parent 8b61802
commit f7e664d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -35,6 +35,7 @@ jobs:
                     ./app/console cache:clear --env=ci && \
                     cd theme && CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile && EB_THEME=skeune yarn build
                 '
+
             - name: Run code quality tests
               if: always()
               run: |

diff --git a/docker/php-fpm/Dockerfile-php72 b/docker/php-fpm/Dockerfile-php72
@@ -3,6 +3,7 @@ FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2-node16-composer2
 RUN a2enmod ssl
 # Copy phpfpm config
 COPY docker/php-fpm/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/
 RUN chown -R www-data: /var/www/
 WORKDIR /opt/openconext/OpenConext-engineblock