diff --git a/db.env b/db.env deleted file mode 100644 index 2d4a42a..0000000 --- a/db.env +++ /dev/null @@ -1,4 +0,0 @@ -MYSQL_DATABASE=photoview -MYSQL_USER=photoview -MYSQL_PASSWORD=photo-secret -MYSQL_RANDOM_ROOT_PASSWORD=1 diff --git a/docker-compose.yml b/docker-compose.yml index 16abf02..c5b7ff1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,32 +1,24 @@ version: "3" services: - db: - container_name: photoview_db - image: mariadb - restart: always - env_file: - - db.env - volumes: - - db_data:/var/lib/mysql - photoview: container_name: photoview image: viktorstrate/photoview:latest restart: always ports: - "8123:80" - depends_on: - - db + extra_hosts: + - "host.docker:host-gateway" env_file: - photoview.env - mapbox.env + - db.env volumes: - api_cache:/app/cache - /home/edpibu/Pictures:/edpibu/Pictures:ro + - /srv/evg:/srv/evg:ro volumes: - db_data: api_cache: diff --git a/photoview.env b/photoview.env index 3c321c6..87b11cb 100644 --- a/photoview.env +++ b/photoview.env @@ -1,5 +1,7 @@ -MYSQL_URL=photoview:photo-secret@tcp(db)/photoview -API_LISTEN_IP=photoview -API_LISTEN_PORT=80 -PHOTO_CACHE=/app/cache -PUBLIC_ENDPOINT=https://photos.edgarpierre.fr/ +PHOTOVIEW_DATABASE_DRIVER=postgres +PHOTOVIEW_LISTEN_IP=photoview +PHOTOVIEW_LISTEN_PORT=80 +PHOTOVIEW_MEDIA_CACHE=/app/cache +#PHOTOVIEW_API_ENDPOINT=https://photos.edgarpierre.fr/ +#PHOTOVIEW_UI_ENDPOINT=https://photos.edgarpierre.fr/ +#PHOTOVIEW_SERVE_UI=1