Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
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
4 changes: 3 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
{
"image": "mcr.microsoft.com/devcontainers/javascript-node:dev-24-trixie",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
"ghcr.io/devcontainers/features/docker-in-docker:2": {
"moby": "false"
}
},
"customizations": {
"vscode": {
Expand Down
15 changes: 14 additions & 1 deletion .github/workflows/publish-containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jobs:
strategy:
matrix:
folder: ${{ fromJson(needs.list-files.outputs.folders) }}
php_version: [8.5, 8.4, 8.3, 8.2]
permissions:
contents: read
packages: write
Expand All @@ -55,6 +56,15 @@ jobs:
id: lowercase-repo
run: echo "repo=${GITHUB_REPOSITORY@L}" >> $GITHUB_OUTPUT

# read image tag from subdirectory propery file if exists
- uses: xom9ikk/dotenv@v2.3.0
with:
path: "src/${{ matrix.folder }}"
mode: ''
load-mode: 'skip'
env:
PHP_VERSION: ${{ matrix.php_version }}

# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
Expand All @@ -70,5 +80,8 @@ jobs:
with:
subFolder: src/${{ matrix.folder }}
imageName: ${{ env.REGISTRY }}/${{ steps.lowercase-repo.outputs.repo }}/${{ matrix.folder }}
cacheFrom: ${{ env.REGISTRY }}/${{ steps.lowercase-repo.outputs.repo }}/${{ matrix.folder }}
imageTag: ${{ env.imagetag || 'latest' }}
cacheFrom: ${{ env.REGISTRY }}/${{ steps.lowercase-repo.outputs.repo }}/${{ matrix.folder }}:${{ env.imagetag || 'latest' }}
refFilterForPush: "refs/heads/main"
env:
PHP_VERSION: ${{ matrix.php_version }}
8 changes: 4 additions & 4 deletions src/typo3-frankenphp/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
FROM dunglas/frankenphp:php8.4-trixie
ARG PHP_VERSION

FROM dunglas/frankenphp:1-php${PHP_VERSION}-trixie

ARG DEVCONTAINER_SERVICE_ID
ARG DEVCONTAINER_SERVICE_NAME
Expand Down Expand Up @@ -27,6 +29,4 @@ RUN apt-get update && \
gd imagick xdebug opcache tokenizer json iconv mbstring curl phar session simplexml xml @composer && \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

COPY php.ini /usr/local/etc/php/php.ini

COPY typo3.caddyfile /etc/frankenphp/Caddyfile
ENTRYPOINT [ "/bin/bash" ]
6 changes: 4 additions & 2 deletions src/typo3-frankenphp/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile
{
"name": "FrankenPHP 8.4, MariaDB (Dockerfile)",
"name": "FrankenPHP, PHP ${localEnv:PHP_VERSION}, MariaDB (Dockerfile)",
"build": {
"context": ".",
"dockerfile": "Dockerfile",
"args": {
"DEVCONTAINER_SERVICE_NAME": "devcontainer",
"DEVCONTAINER_SERVICE_ID": "10000"
"DEVCONTAINER_SERVICE_ID": "10000",
"COMPOSE_PROFILES": "frankenphp",
"PHP_VERSION": "${localEnv:PHP_VERSION}"
}
},
"customizations": {
Expand Down
1 change: 1 addition & 0 deletions src/typo3-frankenphp/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
imagetag=1-php${PHP_VERSION}-trixie