Merge branch 'main' into fix/installer-style

opencodeco · Feb 9, 2024 · aa5cfac · aa5cfac
2 parents 52c02c9 + 75efda5
commit aa5cfac
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,8 @@
 ARG ALPINE=3.19
 FROM alpine:${ALPINE}
 ARG PHP
-ARG HOST_USER
 COPY rootfs /
 RUN apk add --update --no-cache \
-        doas \
         git \
         docker-cli \
         php${PHP}-cli \
@@ -36,10 +34,11 @@ RUN apk add --update --no-cache \
         php${PHP}-pecl-xdebug \
     && ln -sf /usr/bin/php${PHP} /usr/bin/php \
     && mv /etc/php/php.ini /etc/php${PHP}/conf.d/zzphp.ini \
-    && /usr/local/bin/install-tools \
-    && adduser ${HOST_USER} \
-    && echo "${HOST_USER}" | chpasswd \
-    && echo "permit ${HOST_USER} as root" > /etc/doas.d/doas.conf \
-    && stty -onocr
+    && /usr/local/bin/install-tools
+ARG HOST_USER
+RUN apk add doas; \
+    adduser ${HOST_USER}; \
+    echo "${HOST_USER}" | chpasswd; \
+    echo "permit ${HOST_USER} as root" > /etc/doas.d/doas.conf
 ENTRYPOINT [ "/usr/bin/php" ]
 CMD [ "-v" ]