Migrate to Podman

This commit is contained in:
2023-07-06 16:11:02 +00:00
parent b4424a7782
commit 8ef39ffe48
7 changed files with 82 additions and 78 deletions

View File

@@ -17,8 +17,8 @@ services:
# - "8000:8000" # uwsgi socket
env_file:
- stack.env
volumes_from:
- tmp
# volumes_from:
# - tmp
depends_on:
# redis:
# condition: service_healthy
@@ -46,11 +46,11 @@ services:
- fisk_static:${STATIC_ROOT}
env_file:
- stack.env
volumes_from:
- tmp
# volumes_from:
# - tmp
depends_on:
redis:
condition: service_healthy
# redis:
# condition: service_healthy
migration:
condition: service_started
collectstatic:
@@ -72,8 +72,8 @@ services:
- ${PORTAINER_GIT_DIR}:/code
- ${APP_DATABASE_FILE}:/conf/db.sqlite3
- fisk_static:${STATIC_ROOT}
volumes_from:
- tmp
# volumes_from:
# - tmp
env_file:
- stack.env
@@ -89,27 +89,27 @@ services:
- ${PORTAINER_GIT_DIR}:/code
- ${APP_DATABASE_FILE}:/conf/db.sqlite3
- fisk_static:${STATIC_ROOT}
volumes_from:
- tmp
# volumes_from:
# - tmp
env_file:
- stack.env
nginx:
image: nginx:latest
image: nginxinc/nginx-unprivileged:latest
container_name: nginx_fisk
ports:
- ${APP_PORT}:9999
ulimits:
nproc: 65535
nofile:
soft: 65535
hard: 65535
# ulimits:
# nproc: 65535
# nofile:
# soft: 65535
# hard: 65535
volumes:
- ${PORTAINER_GIT_DIR}:/code
- ${PORTAINER_GIT_DIR}/docker/nginx/conf.d/${OPERATION}.conf:/etc/nginx/conf.d/default.conf
- fisk_static:${STATIC_ROOT}
volumes_from:
- tmp
# volumes_from:
# - tmp
networks:
- default
- xf
@@ -124,33 +124,36 @@ services:
# redis:
# condition: service_healthy
tmp:
image: busybox
container_name: tmp_fisk
command: chmod -R 777 /var/run/socks
volumes:
- /var/run/socks
# tmp:
# image: busybox
# container_name: tmp_fisk
# command: chmod -R 777 /var/run/socks
# volumes:
# - /var/run/socks
# For caching
redis:
image: redis
container_name: redis_fisk
command: redis-server /etc/redis.conf
ulimits:
nproc: 65535
nofile:
soft: 65535
hard: 65535
volumes:
- ${PORTAINER_GIT_DIR}/docker/redis.conf:/etc/redis.conf
- fisk_redis_data:/data
volumes_from:
- tmp
healthcheck:
test: "redis-cli -s /var/run/socks/redis.sock ping"
interval: 2s
timeout: 2s
retries: 15
# # For caching
# redis:
# image: redis
# container_name: redis_fisk
# command: redis-server /etc/redis.conf
# #ulimits:
# # nproc: 65535
# # nofile:
# # soft: 65535
# # hard: 65535
# volumes:
# - ${PORTAINER_GIT_DIR}/docker/redis.conf:/etc/redis.conf
# - fisk_redis_data:/data
# volumes_from:
# - tmp
# healthcheck:
# test: "redis-cli -s /var/run/socks/redis.sock ping"
# interval: 2s
# timeout: 2s
# retries: 15
# depends_on:
# tmp:
# condition: service_started
# pyroscope:
# image: "pyroscope/pyroscope:latest"