Revert "Remove UID hack (#519)"

This reverts commit 76819b5.

Author: joecorall

base/Dockerfile

@@ -40,7 +40,7 @@ ARG \
   MARIADB_CLIENT_VERSION=11.4.8-r0 \
   # renovate: datasource=repology depName=alpine_3_22/mysql-client
   MYSQL_CLIENT_VERSION=11.4.8-r0 \
-  # renovate: datasource=repology depName=alpine_3_22/netcat-openbsd
+  # renovate: datasource=repology depName=alpine_3_22/netcat-openbsd	
   NETCAT_OPENBSD_VERSION=1.229.1-r0 \
   # renovate: datasource=repology depName=alpine_3_22/openssl
   OPENSSL_VERSION=3.5.4-r0 \
@@ -161,7 +161,9 @@ ENV \
     DB_ROOT_PASSWORD=password \
     DB_ROOT_USER=root \
     DB_USER=default \
-    JWT_ADMIN_TOKEN=islandora
+    DEVELOPMENT_ENVIRONMENT=false \
+    JWT_ADMIN_TOKEN=islandora \
+    UID=
 
 COPY --link rootfs /
 

base/README.md

@@ -122,6 +122,16 @@ and `DB_MYSQL_PORT` variables will be used when connecting to the backend.
 > `FCREPO_DB_NAME`. This is to allow for different settings on a per-service
 > basis when sharing the same confd backend.
 
+### Development Settings
+
+When doing development with the containers it is sometimes useful to remap the
+`uid` of users in the container to match that of the host user to prevent
+permission denied errors when bind mounting files.
+
+| Environment Variable    | Default | Description                                                                                                                       |
+| :---------------------- | :------ | :-------------------------------------------------------------------------------------------------------------------------------- |
+| DEVELOPMENT_ENVIRONMENT | false   | Set to `true` if using the containers for development, runs start up scripts to remap `uid` of users inside of the container etc. |
+| UID                     |         | The `uid` of the host user                                                                                                        |
 
 [Alpine Linux]: https://alpinelinux.org
 [bearer authentication]: https://tools.ietf.org/html/rfc6750

drupal/rootfs/etc/s6-overlay/s6-rc.d/confd-oneshot/dependencies.d/development-environment

@@ -0,0 +1 @@
+oneshot

drupal/rootfs/etc/s6-overlay/s6-rc.d/development-environment/dependencies.d/container-environment

@@ -0,0 +1,2 @@
+# Change uid of nginx user to match host.
+/etc/s6-overlay/scripts/development-environment.sh

drupal/rootfs/etc/s6-overlay/s6-rc.d/development-environment/type

@@ -0,0 +1,19 @@
+#!/command/with-contenv bash
+# shellcheck shell=bash
+set -e
+
+# UID should only be set in the development environments.
+if [[ "${DEVELOPMENT_ENVIRONMENT}" == "true" ]]; then
+  if [[ -n "${UID}" ]]; then
+    if ! getent passwd ${UID}; then
+      usermod -u ${UID} nginx
+    fi
+    if [[ "$(stat -c %u /var/www/drupal)" != "${UID}" ]]; then
+      chown -R nginx:nginx /var/www
+    fi
+  fi
+fi
+
+# always ensure nginx has access to the socket
+chown -R nginx:nginx /run/php-fpm83
+