Build and publish test container

.github/workflows/build-push-docker-image.yml

@@ -42,13 +42,3 @@ jobs:
             ghcr.io/openconext/stepup-gssp-example/stepup-gssp-example:prod
             ghcr.io/openconext/stepup-gssp-example/stepup-gssp-example:${{ github.sha }}
             ghcr.io/openconext/stepup-gssp-example/stepup-gssp-example:${{ steps.release.outputs.tag_name }}
-
-      - name: Build and push the Development image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: docker/Dockerfile.dev
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            ghcr.io/openconext/stepup-gssp-example/stepup-gssp-example:dev

.github/workflows/build-push-test-docker-image.yml

@@ -0,0 +1,57 @@
+name: build-push-test-docker-image
+
+on:
+  push:
+    branches: feature/build-and-publish-test-container
+  workflow_dispatch:
+
+jobs:
+  build-push-test-docker-image:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Build the app
+        uses: openconext/build-and-publish-test-container/php82-node20@main
+        with:
+          use_yarn: true
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set docker labels and tags
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/openconext/stepup-gssp-example/stepup-gssp-example
+          flavor: |
+            latest=false
+            suffix=-test
+          tags: |
+            type=ref,event=tag
+            type=semver,pattern={{version}}
+            type=sha
+            type=raw,suffix=,value=test
+
+      - name: Build and push the TEST image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: docker/Dockerfile.test
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/tag-release.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: OpenConext/Stepup-Build
-          ref: master
+          ref: feature/php82_build
       - name: Output the semver tag to the tag variable
         id: vars
         run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}

component_info

@@ -1,5 +1,6 @@
-PHP_VERSION=72
+PHP_VERSION=82
 SYMFONY_VERSION=4
 ENCORE=yes
 ASSETIC=no
 NODE_VERSION=14
+TEST_EXTRA_DIRS="dev/ tests/ ci/"

config/services_smoketest.yaml

@@ -0,0 +1,19 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    Surfnet\Gssp\Test\Features\Context\WebContext:
+        public: true
+        arguments:
+            - "@kernel"
+
+    Dev\:
+        resource: '../dev/*'
+        exclude: '../dev/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
+
+    # controllers are imported separately to make sure services can be injected
+    # as action arguments even if you don't extend any base controller class
+    Dev\Controller\:
+        resource: '../dev/Controller'
+        tags: [ 'controller.service_arguments' ]

docker/Dockerfile.prod

@@ -1,12 +1,12 @@
-FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest AS php-build
+FROM ghcr.io/openconext/openconext-basecontainers/php82-apache2:latest AS php-build
+# Set the default workdir
+WORKDIR /var/www/html
+
 COPY *.tar.bz2 /tmp/
 RUN tar -xvjf /tmp/*.tar.bz2 -C /var/www/html/ && \
   rm -rf /tmp/*.tar.bz2
-
 # Add the application configuration files
-COPY config/packages/parameters.yaml.dist config/packages/parameters.yaml
-COPY config/packages/prod/monolog.yaml.docker config/packages/prod/monolog.yaml
-COPY .env.docker .env
+COPY config/openconext/parameters.yaml.dist config/openconext/parameters.yaml
 
 # Add the config files for Apache2
 RUN rm -rf /etc/apache2/sites-enabled/*
@@ -15,7 +15,4 @@ RUN mkdir -p /var/www/html/var && \
   rm -rf /var/www/html/var/cache/prod && \
   chown -R www-data /var/www/html/var
 
-# Set the default workdir
-WORKDIR /var/www/html
-
 CMD ["apache2-foreground"]

docker/Dockerfile.test

@@ -0,0 +1,20 @@
+FROM busybox AS unpack
+WORKDIR /unpack
+COPY output.zip /unpack
+RUN unzip /unpack/output.zip
+
+FROM ghcr.io/openconext/openconext-basecontainers/php82-apache2:latest
+# Set the default workdir
+WORKDIR /var/www/html
+COPY --from=unpack /unpack/ /var/www/html/
+# Add the application configuration files
+COPY config/openconext/parameters.yaml.dist config/openconext/parameters.yaml
+
+# Add the config files for Apache2
+RUN rm -rf /etc/apache2/sites-enabled/*
+COPY ./docker/conf/apache2.conf /etc/apache2/sites-enabled/apache2.conf
+RUN mkdir -p /var/www/html/var && \
+  rm -rf /var/www/html/var/cache/prod && \
+  chown -R www-data /var/www/html/var
+
+CMD ["apache2-foreground"]