Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: move docker specific setup to dockerfile

This commit is contained in:
jo 2023-03-03 17:40:08 +01:00 committed by Kyle Robbertze
parent b675e04df2
commit 00ceb9bd46
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -174,6 +174,9 @@ CMD ["/usr/local/bin/gunicorn", \
ARG LIBRETIME_VERSION ARG LIBRETIME_VERSION
ENV LIBRETIME_VERSION=$LIBRETIME_VERSION ENV LIBRETIME_VERSION=$LIBRETIME_VERSION
HEALTHCHECK CMD ["python3", "-c", \
"import requests; requests.get('http://localhost:9001/api/v2/version').raise_for_status()"]
#======================================================================================# #======================================================================================#
# Worker # # Worker #
#======================================================================================# #======================================================================================#
@ -213,6 +216,7 @@ ENV LIBRETIME_VERSION=$LIBRETIME_VERSION
FROM php:7.4-fpm as libretime-legacy FROM php:7.4-fpm as libretime-legacy
ENV LIBRETIME_CONFIG_FILEPATH=/etc/libretime/config.yml ENV LIBRETIME_CONFIG_FILEPATH=/etc/libretime/config.yml
ENV LIBRETIME_LOG_FILEPATH=php://stderr
# Custom user # Custom user
ARG USER=libretime ARG USER=libretime

4
docker-compose.yml
View File

@ -71,8 +71,6 @@ services:
volumes: volumes:
- ${LIBRETIME_CONFIG_FILEPATH:-./config.yml}:/etc/libretime/config.yml:ro - ${LIBRETIME_CONFIG_FILEPATH:-./config.yml}:/etc/libretime/config.yml:ro
- libretime_storage:/srv/libretime - libretime_storage:/srv/libretime
healthcheck:
test: python3 -c "import requests; requests.get('http://localhost:9001/api/v2/version').raise_for_status()"
legacy: legacy:
image: ghcr.io/libretime/libretime-legacy:${LIBRETIME_VERSION:-latest} image: ghcr.io/libretime/libretime-legacy:${LIBRETIME_VERSION:-latest}
@ -83,8 +81,6 @@ services:
- ${LIBRETIME_CONFIG_FILEPATH:-./config.yml}:/etc/libretime/config.yml:ro - ${LIBRETIME_CONFIG_FILEPATH:-./config.yml}:/etc/libretime/config.yml:ro
- libretime_assets:/var/www/html - libretime_assets:/var/www/html
- libretime_storage:/srv/libretime - libretime_storage:/srv/libretime
environment:
LIBRETIME_LOG_FILEPATH: php://stderr
nginx: nginx:
image: nginx image: nginx