Add "make clear" command and fix dev docker environment (#358)

vjik · web-flow · commit d0974174c095 · 2025-07-14T17:39:15.000+03:00
diff --git a/Makefile b/Makefile
@@ -26,6 +26,9 @@ up: ## Up the dev environment
 down: ## Down the dev environment
 	$(DOCKER_COMPOSE_DEV) down --remove-orphans
 
+clear: ## Remove development docker containers and volumes
+	$(DOCKER_COMPOSE_DEV) down --volumes --remove-orphans
+
 shell: ## Get into container shell
 	$(DOCKER_COMPOSE_DEV) exec app /bin/sh
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -24,10 +24,25 @@ RUN install-php-extensions \
 #
 
 FROM base AS dev
+ARG USER_ID=10001
+ARG GROUP_ID=10001
+ARG USER_NAME=www-data
+ARG GROUP_NAME=www-data
+
 RUN install-php-extensions \
     xdebug
+
 COPY --from=composer /composer /usr/bin/composer
-USER www-data
+
+# Based on https://frankenphp.dev/docs/docker/#running-as-a-non-root-user
+RUN \
+	groupadd --gid ${GROUP_ID} ${GROUP_NAME}; \
+    useradd --gid ${GROUP_ID} --uid ${USER_ID} ${GROUP_NAME}; \
+	# Add additional capability to bind to port 80 and 443
+	setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/frankenphp; \
+	# Give write access to /data/caddy and /config/caddy
+	chown -R ${USER_NAME}:${GROUP_NAME} /data/caddy && chown -R ${USER_NAME}:${GROUP_NAME} /config/caddy
+USER ${USER_NAME}
 
 #
 # Production
diff --git a/docker/compose.dev.yml b/docker/compose.dev.yml
@@ -4,7 +4,9 @@ services:
       dockerfile: docker/Dockerfile
       context: ..
       target: dev
-    user: ${UID}:${GID}
+      args:
+        USER_ID: ${UID}
+        GROUP_ID: ${GID}
     environment:
       XDEBUG_MODE: "${XDEBUG_MODE:-develop}"
       APP_ENV: "${APP_ENV:-dev}"
diff --git a/docker/compose.test.yml b/docker/compose.test.yml
@@ -4,7 +4,9 @@ services:
       dockerfile: docker/Dockerfile
       context: ..
       target: dev
-    user: ${UID}:${GID}
+      args:
+        USER_ID: ${UID}
+        GROUP_ID: ${GID}
     environment:
       XDEBUG_MODE: "off"
       APP_ENV: "test"
