aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.devcontainer/Dockerfile5
-rw-r--r--Docker/Dockerfile-Alpine2
2 files changed, 3 insertions, 4 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index db7db4d60..e383254dc 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.17
ENV TZ UTC
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
@@ -18,8 +18,7 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \
sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" \
/etc/apache2/httpd.conf
-RUN addgroup developer && \
- adduser --ingroup developer --disabled-password developer && \
+RUN adduser --ingroup www-data --disabled-password developer && \
echo "developer ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/developer
ENV COPY_LOG_TO_SYSLOG On
diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine
index 1e5a95125..75afa5486 100644
--- a/Docker/Dockerfile-Alpine
+++ b/Docker/Dockerfile-Alpine
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.17
ENV TZ UTC
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]