Use run for various commands

.dockerignore

@@ -1,5 +1,3 @@
-# This ignore file is used for COPY statement within Dockerfile when building production image.
-
 # Ignore everything
 *
 

Makefile

@@ -23,11 +23,14 @@ up-build: ## Up the dev environment rebuilding images.
 down: ## Down the dev environment.
 	docker compose -f docker/compose.yml -f docker/compose.dev.yml down --remove-orphans
 
-run: ## Run a command within the container.
+exec: ## Run a command within the existing container.
 	docker compose -f docker/compose.yml -f docker/compose.dev.yml exec app $(CMD) $(RUN_ARGS)
 
+run: ## Run a command within a temporary container.
+	docker compose -f docker/compose.yml -f docker/compose.dev.yml run --rm --entrypoint $(CMD) app $(RUN_ARGS)
+
 shell: CMD="/bin/sh" ## Get into container shell.
-shell: run
+shell: exec
 
 yii: CMD="./yii" ## Execute Yii command.
 yii: run

docker/.env

@@ -6,6 +6,6 @@ PROD_SSH="ssh://docker-web"
 IMAGE=app-api
 IMAGE_TAG=latest
 
-XDEBUG_MODE:off
-
 DEV_PORT=80
+
+# XDEBUG_MODE=develop,debug

docker/Dockerfile

@@ -6,13 +6,16 @@ ARG GID=10001
 RUN <<SH
     set -eo pipefail
     set -x
+
+    # Add www-data group and user.
     addgroup -g ${GID} -S www-data
     adduser -u ${UID} -D -S -G www-data www-data
 
-    # Set volume permissions
+    # Set volume permissions.
     mkdir -p /data /config /app/runtime && \
     chown -R www-data:www-data /data /config /app/runtime
 
+    # Install extra packages.
     apk add --no-cache \
     php-frankenphp-8.3-opcache \
     php-frankenphp-8.3-mbstring \

docker/compose.dev.yml

@@ -8,9 +8,9 @@ services:
         UID: ${UID}
         GID: ${GID}
     environment:
-      XDEBUG_MODE: "${XDEBUG_MODE:-off}"
-      YII_ENV: "dev"
-      YII_DEBUG: true
+      XDEBUG_MODE: "${XDEBUG_MODE:-develop}"
+      YII_ENV: "${YII_ENV:-dev}"
+      YII_DEBUG: ${YII_DEBUG:-true}
       SERVER_NAME: ":80"
     restart: unless-stopped
     ports:

docker/compose.prod.yml

@@ -9,6 +9,8 @@ services:
       - caddy_config:/config
     environment:
       SERVER_NAME: ":80"
+      YII_ENV: "${YII_ENV:-prod}"
+      YII_DEBUG: ${YII_DEBUG:-false}
     deploy:
       replicas: 2
       update_config: