Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// More info: https://containers.dev/implementors/json_reference/
{
"image": "mcr.microsoft.com/devcontainers/javascript-node:latest",
"image": "mcr.microsoft.com/devcontainers/javascript-node:dev-24-trixie",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
},
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/publish-containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
tags: ["v*.*.*"]
pull_request:
branches: ["main"]
workflow_dispatch:

env:
# Use docker.io for Docker Hub if empty
Expand Down
7 changes: 2 additions & 5 deletions src/typo3-frankenphp/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ FROM dunglas/frankenphp:php8.4-trixie

ARG DEVCONTAINER_SERVICE_ID
ARG DEVCONTAINER_SERVICE_NAME
ARG COMPOSE_PROFILES

ENV DEVCONTAINER_SERVICE_ID=${DEVCONTAINER_SERVICE_ID}
ENV DEVCONTAINER_SERVICE_NAME=${DEVCONTAINER_SERVICE_NAME}
ENV COMPOSE_PROFILES=${COMPOSE_PROFILES}
ENV WORKSPACE_ROOT=${WORKSPACE_ROOT:-/workspace}
ENV WORKSPACE_ROOT=${WORKSPACE_ROOT:-/workspaces}

USER root

Expand All @@ -17,7 +15,6 @@ RUN addgroup --gid ${DEVCONTAINER_SERVICE_ID} ${DEVCONTAINER_SERVICE_NAME} && \
--disabled-password --shell /bin/false --uid ${DEVCONTAINER_SERVICE_ID} $DEVCONTAINER_SERVICE_NAME

RUN apt-get update && \
mkdir -vp var/log && \
apt-get install -y \
locales-all \
openssh-client \
Expand All @@ -32,4 +29,4 @@ RUN apt-get update && \

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

COPY typo3.caddyfile /etc/frankenphp/Caddyfile
COPY typo3.caddyfile /etc/frankenphp/Caddyfile
43 changes: 5 additions & 38 deletions src/typo3-frankenphp/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,46 +7,9 @@
"dockerfile": "Dockerfile",
"args": {
"DEVCONTAINER_SERVICE_NAME": "devcontainer",
"DEVCONTAINER_SERVICE_ID": "10000",
"COMPOSE_PROFILES": "frankenphp"
"DEVCONTAINER_SERVICE_ID": "10000"
}
},
"workspaceFolder": "/workspace/${localWorkspaceFolderBasename}",
"mounts": [
"source=${localWorkspaceFolderBasename}-build,target=${containerWorkspaceFolder}/.build,type=volume"
],
"features": {
"ghcr.io/devcontainers/features/sshd:1": {},
"ghcr.io/devcontainers/features/docker-in-docker:2": {
"moby": false
}
},
"containerEnv": {
"WORKSPACE_ROOT": "${containerWorkspaceFolder:-/workspace}",
"TYPO3_INSTALL_WEB_SERVER_CONFIG": "other",
"SERVER_NAME": "127.0.0.1"
},
"forwardPorts": [
80,
2222,
3306,
8080
],
"portsAttributes": {
"80": {
"label": "Webserver"
},
"2222": {
"label": "SSH daemon Port"
},
"3306": {
"label": "Mysql/MariaDB database"
},
"8080": {
"label": "Mysql Adminer"
}
},
"onCreateCommand": "chmod -c +x ${WORKSPACE_ROOT}/.devcontainer/onCreateCommandScript.sh && ${WORKSPACE_ROOT}/.devcontainer/onCreateCommandScript.sh",
"customizations": {
"vscode": {
"extensions": [
Expand All @@ -56,6 +19,10 @@
"debug.openDebug": "openOnDebugBreak",
"debug.internalConsoleOptions": "openOnSessionStart",
"extensions.autoUpdate": false,
"editor.selectionHighlight": false,
"editor.suggestSelection": "first",
"editor.tabCompletion": "onlySnippets",
"editor.wordBasedSuggestions": "off",
"editor.codeActionsOnSave": {
"source.fixAll.markdownlint": "explicit"
},
Expand Down
34 changes: 0 additions & 34 deletions src/typo3-frankenphp/.env

This file was deleted.

42 changes: 0 additions & 42 deletions src/typo3-frankenphp/Dockerfile copy

This file was deleted.