Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to Baikal 0.10.1 #233

Merged
merged 2 commits into from
Nov 17, 2024
Merged

Updated to Baikal 0.10.1 #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85cf729
Updated to Baikal 0.10.1
ckulka Nov 17, 2024
d323ed9
Disabled mail tests because mailslurper no longer works
ckulka Nov 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/test-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
12 changes: 4 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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`.

Expand Down
2 changes: 1 addition & 1 deletion apache-php8.2.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion apache.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion nginx-php8.2.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion nginx.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down