From 4804a15adfa0f35ce615e177f8df11a7f3693996 Mon Sep 17 00:00:00 2001 From: Bart Geesink Date: Wed, 17 Apr 2024 15:21:08 +0200 Subject: [PATCH] Remove php82-apache2-node16 container. We do not use it --- .../build-php82-apache2-node16-composer2.yaml | 61 ------------------- README.md | 1 - php82-apache2-node16-composer2/Dockerfile | 13 ---- .../conf/appconf.conf | 31 ---------- .../conf/xdebug.ini | 6 -- 5 files changed, 112 deletions(-) delete mode 100644 .github/workflows/build-php82-apache2-node16-composer2.yaml delete mode 100644 php82-apache2-node16-composer2/Dockerfile delete mode 100644 php82-apache2-node16-composer2/conf/appconf.conf delete mode 100644 php82-apache2-node16-composer2/conf/xdebug.ini diff --git a/.github/workflows/build-php82-apache2-node16-composer2.yaml b/.github/workflows/build-php82-apache2-node16-composer2.yaml deleted file mode 100644 index faed3e6..0000000 --- a/.github/workflows/build-php82-apache2-node16-composer2.yaml +++ /dev/null @@ -1,61 +0,0 @@ -name: Build the PHP 8.2 Apache2 Node16 Composer2 container - -on: - push: - branches: - - main - paths: - - php82-apache2-node16-composer2/** - schedule: - - cron: '0 7 * * *' - workflow_dispatch: - -jobs: - build-push-php82: - runs-on: ubuntu-latest - permissions: - packages: write - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx- - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v4 - with: - context: ./php82-apache2-node16-composer2 - platforms: linux/amd64,linux/arm64 - push: true - tags: | - ghcr.io/openconext/openconext-basecontainers/php82-apache2-node16-composer2:latest - ghcr.io/openconext/openconext-basecontainers/php82-apache2-node16-composer2:${{ github.sha }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - - # Temp fix - # https://github.com/docker/build-push-action/issues/252 - # https://github.com/moby/buildkit/issues/1896 - name: Move cache - run: | - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-new /tmp/.buildx-cache diff --git a/README.md b/README.md index 0486c4b..a7d1007 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,6 @@ We provide the following base containers which can be used in downstream project ![Build status for php82 apache2 production image](https://github.com/OpenConext/OpenConext-BaseContainers/actions/workflows/build-php82-apache2.yaml/badge.svg) **Dev images:**
-![Build status for php82 apache2 node16 image](https://github.com/OpenConext/OpenConext-BaseContainers/actions/workflows/build-php82-apache2-node16-composer2.yaml/badge.svg)
![Build status for php82 apache2 node20 image](https://github.com/OpenConext/OpenConext-BaseContainers/actions/workflows/build-php82-apache2-node20-composer2.yaml/badge.svg) ## Features diff --git a/php82-apache2-node16-composer2/Dockerfile b/php82-apache2-node16-composer2/Dockerfile deleted file mode 100644 index 0c6e090..0000000 --- a/php82-apache2-node16-composer2/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM ghcr.io/openconext/openconext-basecontainers/php82-apache2:latest -COPY --from=composer:2 /usr/bin/composer /usr/bin/composer -COPY --from=node:16-slim /usr/local/bin /usr/local/bin -COPY --from=node:16-slim /opt /opt -COPY --from=node:16-slim /usr/local/lib/node_modules /usr/local/lib/node_modules -SHELL ["/bin/bash", "--login", "-c"] -RUN apt update && apt -y install git unzip zip vim -RUN pecl install xdebug && docker-php-ext-enable xdebug -COPY ./conf/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini -RUN apt autoremove -y && apt clean && apt autoclean && rm -rf /var/lib/apt/lists/* -RUN mkdir -p /var/www/html/public -RUN rm -rf /etc/apache2/sites-enabled/* -COPY ./conf/appconf.conf /etc/apache2/sites-enabled/ diff --git a/php82-apache2-node16-composer2/conf/appconf.conf b/php82-apache2-node16-composer2/conf/appconf.conf deleted file mode 100644 index 2267438..0000000 --- a/php82-apache2-node16-composer2/conf/appconf.conf +++ /dev/null @@ -1,31 +0,0 @@ -ServerAdmin admin@dev.openconext.local - -DocumentRoot /var/www/html/public - -SetEnv HTTPS on -SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1 - - - Require all granted - - Options -MultiViews - RewriteEngine On - RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^(.*)$ index.php [QSA,L] - - - Require all granted - - -Header always set X-Content-Type-Options "nosniff" - -# Set the php application handler so mod_php interpets the files - - SetHandler application/x-httpd-php - - -ExpiresActive on -ExpiresByType font/* "access plus 1 year" -ExpiresByType image/* "access plus 6 months" -ExpiresByType text/css "access plus 1 year" -ExpiresByType text/js "access plus 1 year" diff --git a/php82-apache2-node16-composer2/conf/xdebug.ini b/php82-apache2-node16-composer2/conf/xdebug.ini deleted file mode 100644 index a231734..0000000 --- a/php82-apache2-node16-composer2/conf/xdebug.ini +++ /dev/null @@ -1,6 +0,0 @@ -xdebug.mode = debug -xdebug.discover_client_host = true -xdebug.idekey = PHPSTORM -xdebug.client_host=host.docker.internal -xdebug.client_port=9003 -zend_extension=xdebug