mirror of
https://github.com/yusing/godoxy.git
synced 2025-07-03 13:44:25 +02:00
fix: docker compose and bind permission
This commit is contained in:
parent
fbc847d0b3
commit
b3c0192621
4 changed files with 9 additions and 9 deletions
|
@ -60,6 +60,7 @@ GODOXY_FRONTEND_ALIASES=godoxy
|
|||
# Docker socket
|
||||
# /var/run/podman/podman.sock for podman
|
||||
DOCKER_SOCKET=/var/run/docker.sock
|
||||
SOCKET_PROXY_LISTEN_ADDR=127.0.0.1:2375
|
||||
|
||||
# Debug mode
|
||||
GODOXY_DEBUG=false
|
|
@ -4,7 +4,7 @@ HEALTHCHECK NONE
|
|||
|
||||
# package version does not matter
|
||||
# trunk-ignore(hadolint/DL3018)
|
||||
RUN apk add --no-cache tzdata make
|
||||
RUN apk add --no-cache tzdata make libcap-setcap
|
||||
|
||||
ENV GOPATH=/root/go
|
||||
|
||||
|
|
8
Makefile
8
Makefile
|
@ -60,11 +60,11 @@ else
|
|||
SETCAP_CMD = sudo setcap
|
||||
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
|
||||
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
|
||||
|
||||
.PHONY: debug
|
||||
|
|
|
@ -18,7 +18,7 @@ services:
|
|||
tmpfs:
|
||||
- /run
|
||||
ports:
|
||||
- 127.0.0.1:2375:2375
|
||||
- ${SOCKET_PROXY_LISTEN_ADDR:-127.0.0.1:2375}:2375
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:2375"]
|
||||
interval: 1m30s
|
||||
|
@ -32,6 +32,7 @@ services:
|
|||
network_mode: host # do not change this
|
||||
env_file: .env
|
||||
user: ${GODOXY_UID:-1000}:${GODOXY_GID:-1000}
|
||||
read_only: true
|
||||
security_opt:
|
||||
- no-new-privileges:true
|
||||
cap_drop:
|
||||
|
@ -63,10 +64,8 @@ services:
|
|||
- no-new-privileges:true
|
||||
cap_drop:
|
||||
- all
|
||||
cap_add:
|
||||
- NET_BIND_SERVICE
|
||||
environment:
|
||||
- DOCKER_HOST=127.0.0.1:2375
|
||||
- DOCKER_HOST=tcp://${SOCKET_PROXY_LISTEN_ADDR:-127.0.0.1}:2375
|
||||
volumes:
|
||||
- ./config:/app/config
|
||||
- ./logs:/app/logs
|
||||
|
|
Loading…
Add table
Reference in a new issue