fix: docker compose and bind permission

This commit is contained in:
yusing 2025-04-28 01:35:09 +08:00
parent fbc847d0b3
commit b3c0192621
4 changed files with 9 additions and 9 deletions

View file

@ -60,6 +60,7 @@ GODOXY_FRONTEND_ALIASES=godoxy
# Docker socket # Docker socket
# /var/run/podman/podman.sock for podman # /var/run/podman/podman.sock for podman
DOCKER_SOCKET=/var/run/docker.sock DOCKER_SOCKET=/var/run/docker.sock
SOCKET_PROXY_LISTEN_ADDR=127.0.0.1:2375
# Debug mode # Debug mode
GODOXY_DEBUG=false GODOXY_DEBUG=false

View file

@ -4,7 +4,7 @@ HEALTHCHECK NONE
# package version does not matter # package version does not matter
# trunk-ignore(hadolint/DL3018) # trunk-ignore(hadolint/DL3018)
RUN apk add --no-cache tzdata make RUN apk add --no-cache tzdata make libcap-setcap
ENV GOPATH=/root/go ENV GOPATH=/root/go

View file

@ -60,11 +60,11 @@ else
SETCAP_CMD = sudo setcap SETCAP_CMD = sudo setcap
endif endif
ifeq ($(docker), 1)
POST_BUILD = mkdir -p /app && mv ${BIN_PATH} /app/run
else
# CAP_NET_BIND_SERVICE: permission for binding to :80 and :443 # CAP_NET_BIND_SERVICE: permission for binding to :80 and :443
POST_BUILD = $(SETCAP_CMD) CAP_NET_BIND_SERVICE=+ep ${BIN_PATH} POST_BUILD = $(SETCAP_CMD) CAP_NET_BIND_SERVICE=+ep ${BIN_PATH};
ifeq ($(docker), 1)
POST_BUILD += mkdir -p /app && mv ${BIN_PATH} /app/run;
endif endif
.PHONY: debug .PHONY: debug

View file

@ -18,7 +18,7 @@ services:
tmpfs: tmpfs:
- /run - /run
ports: ports:
- 127.0.0.1:2375:2375 - ${SOCKET_PROXY_LISTEN_ADDR:-127.0.0.1:2375}:2375
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:2375"] test: ["CMD", "curl", "-f", "http://localhost:2375"]
interval: 1m30s interval: 1m30s
@ -32,6 +32,7 @@ services:
network_mode: host # do not change this network_mode: host # do not change this
env_file: .env env_file: .env
user: ${GODOXY_UID:-1000}:${GODOXY_GID:-1000} user: ${GODOXY_UID:-1000}:${GODOXY_GID:-1000}
read_only: true
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
cap_drop: cap_drop:
@ -63,10 +64,8 @@ services:
- no-new-privileges:true - no-new-privileges:true
cap_drop: cap_drop:
- all - all
cap_add:
- NET_BIND_SERVICE
environment: environment:
- DOCKER_HOST=127.0.0.1:2375 - DOCKER_HOST=tcp://${SOCKET_PROXY_LISTEN_ADDR:-127.0.0.1}:2375
volumes: volumes:
- ./config:/app/config - ./config:/app/config
- ./logs:/app/logs - ./logs:/app/logs