From 87fcff28866cb007467acb5ea4a44459e5d5d35a Mon Sep 17 00:00:00 2001 From: Thomas Hucke Date: Sat, 28 Mar 2026 15:39:05 +0100 Subject: [PATCH 1/3] feat: added user for nomal activities & sudo --- .editorconfig | 5 +++++ src/typo3-frankenphp/.devcontainer/Dockerfile | 6 +++++- src/typo3-frankenphp/.devcontainer/docker-entrypoint.sh | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 .editorconfig create mode 100644 src/typo3-frankenphp/.devcontainer/docker-entrypoint.sh diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..0b3779e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,5 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true diff --git a/src/typo3-frankenphp/.devcontainer/Dockerfile b/src/typo3-frankenphp/.devcontainer/Dockerfile index 08912a2..e5e9dd3 100644 --- a/src/typo3-frankenphp/.devcontainer/Dockerfile +++ b/src/typo3-frankenphp/.devcontainer/Dockerfile @@ -30,4 +30,8 @@ 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/* -ENTRYPOINT [ "/bin/bash" ] +COPY ./docker-entrypoint.sh / + +USER ${DEVCONTAINER_SERVICE_NAME} + +ENTRYPOINT ["/docker-entrypoint.sh"] \ No newline at end of file diff --git a/src/typo3-frankenphp/.devcontainer/docker-entrypoint.sh b/src/typo3-frankenphp/.devcontainer/docker-entrypoint.sh new file mode 100644 index 0000000..d78182d --- /dev/null +++ b/src/typo3-frankenphp/.devcontainer/docker-entrypoint.sh @@ -0,0 +1,3 @@ +#!/bin/bash +umask 0000 +/bin/bash \ No newline at end of file From 629649f05cfe58947415e39304e959a6c3c80dd6 Mon Sep 17 00:00:00 2001 From: Thomas Hucke Date: Sat, 28 Mar 2026 15:48:34 +0100 Subject: [PATCH 2/3] chore: staged files added --- src/typo3-frankenphp/.devcontainer/Dockerfile | 11 +++++++---- src/typo3-frankenphp/.devcontainer/allsudoers | 1 + src/typo3-frankenphp/.devcontainer/devcontainer.json | 12 ++++++++---- 3 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 src/typo3-frankenphp/.devcontainer/allsudoers diff --git a/src/typo3-frankenphp/.devcontainer/Dockerfile b/src/typo3-frankenphp/.devcontainer/Dockerfile index e5e9dd3..e1d4bec 100644 --- a/src/typo3-frankenphp/.devcontainer/Dockerfile +++ b/src/typo3-frankenphp/.devcontainer/Dockerfile @@ -13,12 +13,13 @@ USER root EXPOSE 80 443 RUN addgroup --gid ${DEVCONTAINER_SERVICE_ID} ${DEVCONTAINER_SERVICE_NAME} && \ - adduser --gid ${DEVCONTAINER_SERVICE_ID} --no-create-home --home /nonexistent --comment "devcontainer service user" \ - --disabled-password --shell /bin/false --uid ${DEVCONTAINER_SERVICE_ID} $DEVCONTAINER_SERVICE_NAME + adduser --gid ${DEVCONTAINER_SERVICE_ID} --home /home/${DEVCONTAINER_SERVICE_NAME} --comment "devcontainer service user" \ + --disabled-password --shell /bin/bash --uid ${DEVCONTAINER_SERVICE_ID} $DEVCONTAINER_SERVICE_NAME RUN apt-get update && \ apt-get install -y \ locales-all \ + sudo \ openssh-client \ vim \ procps \ @@ -28,10 +29,12 @@ RUN apt-get update && \ apt-get install -y iproute2 iputils-ping && \ install-php-extensions calendar bcmath exif ftp mysqli pdo pdo_mysql gmp intl zip \ 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/* + apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ + mkdir ${WORKSPACE_ROOT} && cmod 777 ${WORKSPACE_ROOT} +COPY ./allsudoers /etc/sudoers.d/allsudoers COPY ./docker-entrypoint.sh / USER ${DEVCONTAINER_SERVICE_NAME} -ENTRYPOINT ["/docker-entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/docker-entrypoint.sh"] diff --git a/src/typo3-frankenphp/.devcontainer/allsudoers b/src/typo3-frankenphp/.devcontainer/allsudoers new file mode 100644 index 0000000..49615de --- /dev/null +++ b/src/typo3-frankenphp/.devcontainer/allsudoers @@ -0,0 +1 @@ +ALL ALL = NOPASSWD: ALL diff --git a/src/typo3-frankenphp/.devcontainer/devcontainer.json b/src/typo3-frankenphp/.devcontainer/devcontainer.json index 97b0e0b..e9345f4 100644 --- a/src/typo3-frankenphp/.devcontainer/devcontainer.json +++ b/src/typo3-frankenphp/.devcontainer/devcontainer.json @@ -6,9 +6,8 @@ "context": ".", "dockerfile": "Dockerfile", "args": { - "DEVCONTAINER_SERVICE_NAME": "devcontainer", + "DEVCONTAINER_SERVICE_NAME": "typo3dev", "DEVCONTAINER_SERVICE_ID": "10000", - "COMPOSE_PROFILES": "frankenphp", "PHP_VERSION": "${localEnv:PHP_VERSION}" } }, @@ -30,9 +29,14 @@ }, "files.autoSave": "afterDelay", "files.autoSaveDelay": 1000, + "files.eol": "\n", + "files.trimTrailingWhitespace": true, + "files.insertFinalNewline": true, + "git.autofetch": true, "git.postCommitCommand": "push", - "git.path": "/usr/bin/git" + "git.path": "/usr/bin/git", + "gitAutoStage.enable": true } } } -} \ No newline at end of file +} From 7e1ef71222cfa001b011c8ce23b2d3ddf1270114 Mon Sep 17 00:00:00 2001 From: Thomas Hucke Date: Sat, 28 Mar 2026 16:04:56 +0100 Subject: [PATCH 3/3] chore: fixed typo --- src/typo3-frankenphp/.devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/typo3-frankenphp/.devcontainer/Dockerfile b/src/typo3-frankenphp/.devcontainer/Dockerfile index e1d4bec..dbd6ea4 100644 --- a/src/typo3-frankenphp/.devcontainer/Dockerfile +++ b/src/typo3-frankenphp/.devcontainer/Dockerfile @@ -30,7 +30,7 @@ RUN apt-get update && \ install-php-extensions calendar bcmath exif ftp mysqli pdo pdo_mysql gmp intl zip \ 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/* && \ - mkdir ${WORKSPACE_ROOT} && cmod 777 ${WORKSPACE_ROOT} + mkdir -v -m 777 ${WORKSPACE_ROOT} COPY ./allsudoers /etc/sudoers.d/allsudoers COPY ./docker-entrypoint.sh /