Skip to content
Merged
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
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true
15 changes: 11 additions & 4 deletions src/typo3-frankenphp/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -28,6 +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 -v -m 777 ${WORKSPACE_ROOT}

ENTRYPOINT [ "/bin/bash" ]
COPY ./allsudoers /etc/sudoers.d/allsudoers
COPY ./docker-entrypoint.sh /

USER ${DEVCONTAINER_SERVICE_NAME}

ENTRYPOINT ["/docker-entrypoint.sh"]
1 change: 1 addition & 0 deletions src/typo3-frankenphp/.devcontainer/allsudoers
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALL ALL = NOPASSWD: ALL
12 changes: 8 additions & 4 deletions src/typo3-frankenphp/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
},
Expand All @@ -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
}
}
}
}
}
3 changes: 3 additions & 0 deletions src/typo3-frankenphp/.devcontainer/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
umask 0000
/bin/bash
Loading