petru/nextcloud-docker-dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: adds the possibility of using rootless Docker

Browse Source 
Hardcoding the doker.sock path prevents people from using Docker in
rootless mode. Even when symlinking the user's docker.sock into
/var/run/docker.sock does not work, as Docker does not follow the
symlink and mounts a directory instead.

This patch allows to define an environment variable `DOCKER_SOCKET` to
override the default value.

Signed-off-by: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com>
This commit is contained in:
Salvatore Martire
2025-07-04 10:54:31 +02:00
parent 165e7e39ce
commit 821d4dfdf5
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose.yml
View File

@@ -8,7 +8,7 @@ services:
- "${IP_BIND:-127.0.0.1}:${PROXY_PORT_HTTP:-80}:80" - "${IP_BIND:-127.0.0.1}:${PROXY_PORT_HTTP:-80}:80"
- "${IP_BIND:-127.0.0.1}:${PROXY_PORT_HTTPS:-443}:443" - "${IP_BIND:-127.0.0.1}:${PROXY_PORT_HTTPS:-443}:443"
volumes: volumes:
- /var/run/docker.sock:/tmp/docker.sock:ro - ${DOCKER_SOCKET-/var/run/docker.sock}:/tmp/docker.sock:ro
- ./data/ssl/:/etc/nginx/certs - ./data/ssl/:/etc/nginx/certs
- ./data/nginx/vhost.d/:/etc/nginx/vhost.d - ./data/nginx/vhost.d/:/etc/nginx/vhost.d
environment: environment:
@@ -1087,7 +1087,7 @@ services:
container_name: nextcloud-appapi-dsp-http container_name: nextcloud-appapi-dsp-http
network_mode: ${NETWORK_MODE:-master_default} network_mode: ${NETWORK_MODE:-master_default}
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - ${DOCKER_SOCKET-/var/run/docker.sock}:/var/run/docker.sock
environment: environment:
- NC_HAPROXY_PASSWORD=${NC_HAPROXY_PASSWORD:-some_secure_password} - NC_HAPROXY_PASSWORD=${NC_HAPROXY_PASSWORD:-some_secure_password}
- BIND_ADDRESS=${BIND_ADDRESS:-} - BIND_ADDRESS=${BIND_ADDRESS:-}
@@ -1103,7 +1103,7 @@ services:
container_name: nextcloud-appapi-dsp-https container_name: nextcloud-appapi-dsp-https
network_mode: ${NETWORK_MODE:-host} network_mode: ${NETWORK_MODE:-host}
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - ${DOCKER_SOCKET-/var/run/docker.sock}:/var/run/docker.sock
- ${CERT_PATH:-./data/ssl/app_api/app_api.pem}:/certs/cert.pem - ${CERT_PATH:-./data/ssl/app_api/app_api.pem}:/certs/cert.pem
environment: environment:
- NC_HAPROXY_PASSWORD=${NC_HAPROXY_PASSWORD:-some_secure_password} - NC_HAPROXY_PASSWORD=${NC_HAPROXY_PASSWORD:-some_secure_password}

4
example.env
View File

@@ -53,6 +53,10 @@ SQL=mysql
# the entries none, develop, debug, trace, and profile. # the entries none, develop, debug, trace, and profile.
PHP_XDEBUG_MODE=develop PHP_XDEBUG_MODE=develop
# Docker socket location, use it when you run rootless Docker
# Replace "1000" with the uid used by your Docker engine (default $(id -u))
# DOCKER_SOCKET=/run/user/1000/docker.sock
# Nextcloud AppAPI Docker Socket Proxy # Nextcloud AppAPI Docker Socket Proxy
# ------------------------------------ # ------------------------------------
# NC_HAPROXY_PASSWORD=some_secure_password # NC_HAPROXY_PASSWORD=some_secure_password