From ae97fa89af9c1ca490a4fe2dcc18a26986180bda Mon Sep 17 00:00:00 2001 From: Cyrill Kulka Date: Sun, 17 Nov 2024 16:57:15 +0100 Subject: [PATCH] Updated to Baikal 0.10.1 (#233) * Updated to Baikal 0.10.1 * Disabled mail tests because mailslurper no longer works --- .github/workflows/test-job.yaml | 3 +++ README.md | 12 ++++-------- apache-php8.2.dockerfile | 2 +- apache.dockerfile | 2 +- nginx-php8.2.dockerfile | 2 +- nginx.dockerfile | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test-job.yaml b/.github/workflows/test-job.yaml index 47a00db..d56b71d 100644 --- a/.github/workflows/test-job.yaml +++ b/.github/workflows/test-job.yaml @@ -43,11 +43,13 @@ jobs: run: docker stop ${{ inputs.dockerfile }} - name: Build and run MailSlurper + if: false run: | docker build -q 'https://github.com/mailslurper/mailslurper.git#release-1.15.0' -t mailslurper docker run --rm --detach --name mailslurper -p 8085:8085 -v ${{ github.workspace }}/cypress/fixtures/mailslurper-config.json:/config.json:ro mailslurper - name: Start Baikal container with MSMTP configuration + if: false env: MSMTPRC: | account default @@ -59,6 +61,7 @@ jobs: docker cp ${{ github.workspace }}/cypress/fixtures/mail-test.php baikal:/var/www/baikal/html/ - name: Run Cypress tests incl. MSMTP + if: false run: CYPRESS_MSMTP_ENABLED=TRUE npm run test - name: Archive test results diff --git a/README.md b/README.md index dcc5c1f..6430e20 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,10 @@ I follow the same version naming scheme as [Baikal](http://sabre.io/baikal/) the The following tags support multiple architectures, e.g. `amd64`, `arm32v7`, `arm64v8` and `i386`. +- [`0.10.1`, `0.10.1-apache`](https://github.com/ckulka/baikal-docker/blob/0.10.1/apache.dockerfile) +- [`0.10.1-apache-php8.2`, `0.10.1-php8.2`](https://github.com/ckulka/baikal-docker/blob/0.10.1/apache-php8.2.dockerfile) +- [`0.10.1-nginx`](https://github.com/ckulka/baikal-docker/blob/0.10.1/nginx.dockerfile) +- [`0.10.1-nginx-php8.2`](https://github.com/ckulka/baikal-docker/blob/0.10.1/nginx-php8.2.dockerfile) - [`0.10.0`, `0.10.0-apache`](https://github.com/ckulka/baikal-docker/blob/0.10.0/apache.dockerfile) - [`0.10.0-apache-php8.2`, `0.10.0-php8.2`](https://github.com/ckulka/baikal-docker/blob/0.10.0/apache-php8.2.dockerfile) - [`0.10.0-nginx`](https://github.com/ckulka/baikal-docker/blob/0.10.0/nginx.dockerfile) @@ -27,14 +31,6 @@ The following tags support multiple architectures, e.g. `amd64`, `arm32v7`, `arm - [`0.9.5-apache-php8.2`, `0.9.5-php8.2`](https://github.com/ckulka/baikal-docker/blob/0.9.5/apache-php8.2.dockerfile) - [`0.9.5-nginx`](https://github.com/ckulka/baikal-docker/blob/0.9.5/nginx.dockerfile) - [`0.9.5-nginx-php8.2`](https://github.com/ckulka/baikal-docker/blob/0.9.5/nginx-php8.2.dockerfile) -- [`0.9.4`, `0.9.4-apache`](https://github.com/ckulka/baikal-docker/blob/0.9.4+msmtpfix/apache.dockerfile) -- [`0.9.4-php8.0`, `0.9.4-apache-php8.0`, `apache-php8.0`, `latest-php8.0`](https://github.com/ckulka/baikal-docker/blob/0.9.4+msmtpfix/apache-php8.0.dockerfile) -- [`0.9.4-nginx`](https://github.com/ckulka/baikal-docker/blob/0.9.4+msmtpfix/nginx.dockerfile) -- [`0.9.4-nginx-php8.0`, `nginx-php8.0`](https://github.com/ckulka/baikal-docker/blob/0.9.4+msmtpfix/nginx-php8.0.dockerfile) -- [`0.9.3`, `0.9.3-apache`](https://github.com/ckulka/baikal-docker/blob/0.9.3+msmtp/apache.dockerfile) -- [`0.9.3-php8.0`, `0.9.3-apache-php8.0`](https://github.com/ckulka/baikal-docker/blob/0.9.3+msmtp/apache-php8.0.dockerfile) -- [`0.9.3-nginx`](https://github.com/ckulka/baikal-docker/blob/0.9.3+msmtp/nginx.dockerfile) -- [`0.9.3-nginx-php8.0`](https://github.com/ckulka/baikal-docker/blob/0.9.3+msmtp/nginx-php8.0.dockerfile) For earlier versions all the way back to version 0.2.7, please search in the [tags](https://hub.docker.com/r/ckulka/baikal/tags) tab. Version 0.4.5 and older are only available for `amd64`. Version 0.9.0 and older do not support `i386`. diff --git a/apache-php8.2.dockerfile b/apache-php8.2.dockerfile index 3a08318..eb79c50 100644 --- a/apache-php8.2.dockerfile +++ b/apache-php8.2.dockerfile @@ -1,7 +1,7 @@ # Multi-stage build, see https://docs.docker.com/develop/develop-images/multistage-build/ FROM alpine AS builder -ENV VERSION 0.10.0 +ENV VERSION 0.10.1 ADD https://github.com/sabre-io/Baikal/releases/download/$VERSION/baikal-$VERSION.zip . RUN apk add unzip && unzip -q baikal-$VERSION.zip diff --git a/apache.dockerfile b/apache.dockerfile index 27c97f5..b5bb633 100644 --- a/apache.dockerfile +++ b/apache.dockerfile @@ -1,7 +1,7 @@ # Multi-stage build, see https://docs.docker.com/develop/develop-images/multistage-build/ FROM alpine AS builder -ENV VERSION 0.10.0 +ENV VERSION 0.10.1 ADD https://github.com/sabre-io/Baikal/releases/download/$VERSION/baikal-$VERSION.zip . RUN apk add unzip && unzip -q baikal-$VERSION.zip diff --git a/nginx-php8.2.dockerfile b/nginx-php8.2.dockerfile index 4de2b24..1bef679 100644 --- a/nginx-php8.2.dockerfile +++ b/nginx-php8.2.dockerfile @@ -1,7 +1,7 @@ # Multi-stage build, see https://docs.docker.com/develop/develop-images/multistage-build/ FROM alpine AS builder -ENV VERSION 0.10.0 +ENV VERSION 0.10.1 ADD https://github.com/sabre-io/Baikal/releases/download/$VERSION/baikal-$VERSION.zip . RUN apk add unzip && unzip -q baikal-$VERSION.zip diff --git a/nginx.dockerfile b/nginx.dockerfile index 407e999..1715566 100644 --- a/nginx.dockerfile +++ b/nginx.dockerfile @@ -1,7 +1,7 @@ # Multi-stage build, see https://docs.docker.com/develop/develop-images/multistage-build/ FROM alpine AS builder -ENV VERSION 0.10.0 +ENV VERSION 0.10.1 ADD https://github.com/sabre-io/Baikal/releases/download/$VERSION/baikal-$VERSION.zip . RUN apk add unzip && unzip -q baikal-$VERSION.zip