Bensuperpc/infrastructure
1
0
Fork 0
mirror of https://github.com/bensuperpc/infrastructure.git synced 2024-09-19 01:50:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix UID and GID

Browse Source 
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
Bensuperpc 2024-09-08 15:19:48 +02:00
parent 1b9c6ad1ad
commit 860be99a4e
12 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@ -29,49 +29,49 @@ COMPOSE_DIR := --project-directory ./infrastructure
UID := 1000
GID := 1000
BUILD_ARG_VAR := --build-arg UID=$(UID) --build-arg GID=$(GID)
ENV_ARG_VAR := PUID=$(UID) PGID=$(GID)
.PHONY: build all
all: start
.PHONY: build
build:
$(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) build
$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) build
.PHONY: start
start:
$(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) up -d
$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) up -d
.PHONY: start-at
start-at:
$(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) up
$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) up
.PHONY: docker-check
docker-check:
$(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) config
$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) config
.PHONY: stop
stop: down
.PHONY: down
down:
$(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) down
$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) down
.PHONY: restart
restart: stop start
.PHONY: logs
logs:
$(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) logs
$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) logs
.PHONY: state
state:
$(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) ps
$(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) top
$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) ps
$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) top
.PHONY: update-docker
update-docker:
$(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) pull
$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) pull
.PHONY: update
update: update-docker
@ -80,8 +80,8 @@ update: update-docker
.PHONY: clean
clean:
$(DOCKER) images --filter=reference='bensuperpc/*' --format='{{.Repository}}:{{.Tag}}' | xargs -r $(DOCKER) rmi -f
$(ENV_ARG_VAR) $(DOCKER) images --filter=reference='bensuperpc/*' --format='{{.Repository}}:{{.Tag}}' | xargs -r $(DOCKER) rmi -f
.PHONY: purge
purge:
$(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) down -v --rmi all
$(ENV_ARG_VAR) $(DOCKER) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) down -v --rmi all

2
infrastructure/dufs/docker-compose.dufs.yml
View File

@ -5,7 +5,7 @@ services:
container_name: dufs
profiles:
- dufs
user: 1000:1000
user: ${PUID:-1000}:${PGID:-1000}
restart: on-failure:5
depends_on:
- caddy

2
infrastructure/jellyfin/docker-compose.jellyfin.yml
View File

@ -6,7 +6,7 @@ services:
profiles:
- jellyfin
restart: on-failure:5
user: 1000:1000
user: ${PUID:-1000}:${PGID:-1000}
depends_on:
- caddy
env_file:

3
infrastructure/projectsend/docker-compose.projectsend.yml
View File

@ -32,6 +32,9 @@ services:
- projectsend_db:/var/lib/mysql:rw
env_file:
- ./projectsend/env/projectsend_db.env
environment:
- PUID=${PUID:-1000}
- PGID=${PGID:-1000}
command: '--default-authentication-plugin=mysql_native_password'
networks:
- infra-network

2
infrastructure/projectsend/env/projectsend.env vendored
View File

@ -1,3 +1 @@
PUID=1000
PGID=1000
MAX_UPLOAD=50000

2
infrastructure/psitransfer/docker-compose.psitransfer.yml
View File

@ -6,7 +6,7 @@ services:
profiles:
- psitransfer
restart: on-failure:5
user: 1000:1000
user: ${PUID:-1000}:${PGID:-1000}
depends_on:
- caddy
env_file:

3
infrastructure/qbittorrent/docker-compose.qbittorrent.yml
View File

@ -10,6 +10,9 @@ services:
- caddy
env_file:
- ./qbittorrent/env/qbittorrent.env
environment:
- PUID=${PUID:-1000}
- PGID=${PGID:-1000}
volumes:
- qbittorrent_config:/config
- public_data:/downloads

2
infrastructure/qbittorrent/env/qbittorrent.env vendored
View File

@ -1,5 +1,3 @@
PUID=1000
PGID=1000
TZ=Etc/UTC
WEBUI_PORT=8080
TORRENTING_PORT=6881

3
infrastructure/syncthing/docker-compose.syncthing.yml
View File

@ -10,6 +10,9 @@ services:
restart: on-failure:5
env_file:
- ./syncthing/env/syncthing.env
environment:
- PUID=${PUID:-1000}
- PGID=${PGID:-1000}
volumes:
- syncthing_config:/config
- public_data:/data1

2
infrastructure/syncthing/env/syncthing.env vendored
View File

@ -1,2 +0,0 @@
PUID=1000
PGID=1000

3
infrastructure/transmission/docker-compose.transmission.yml
View File

@ -10,6 +10,9 @@ services:
- caddy
env_file:
- ./transmission/env/transmission.env
environment:
- PUID=${PUID:-1000}
- PGID=${PGID:-1000}
volumes:
- transmission_config:/config
- public_data:/downloads

2
infrastructure/transmission/env/transmission.env vendored
View File

@ -1,5 +1,3 @@
PUID=1000
PGID=1000
TZ=Etc/UTC
USER=admin
PASS=4vqXCNGG09JUBe7rXkuQS8MG7ovE6Vxj