From 13ec0fd3f2bed86c3b2dff73014093a6a92fbfb5 Mon Sep 17 00:00:00 2001 From: Dale Wahl Date: Wed, 17 Jul 2024 12:46:59 +0200 Subject: [PATCH] update surf docker-compose.yml this may require a new release --- docker-compose_public_ip.yml | 6 +++--- docker/docker-entrypoint.sh | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker-compose_public_ip.yml b/docker-compose_public_ip.yml index 9fc0ca326..f89665df1 100644 --- a/docker-compose_public_ip.yml +++ b/docker-compose_public_ip.yml @@ -40,8 +40,8 @@ services: - 4cat_data:/usr/src/app/data/ - 4cat_config:/usr/src/app/config/ - 4cat_logs:/usr/src/app/logs/ - # The -p sets your SERVER_NAME to your public IP - entrypoint: docker/docker-entrypoint.sh -p + # The -h sets your SERVER_NAME to hostname + entrypoint: docker/docker-entrypoint.sh -h frontend: image: digitalmethodsinitiative/4cat:${DOCKER_TAG} @@ -54,7 +54,7 @@ services: - backend ports: - ${TELEGRAM_PORT}:443 - - ${PUBLIC_PORT}:5000 + - 8080:5000 volumes: - 4cat_data:/usr/src/app/data/ - 4cat_config:/usr/src/app/config/ diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 6f0cd2235..a46c986ed 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -16,6 +16,9 @@ do -p ) # set public option to use public IP address as SERVER_NAME echo 'Setting SERVER_NAME to public IP' SERVER_NAME=$(curl -s https://api.ipify.org);; + -h ) # set public option to use server hostname as SERVER_NAME + echo 'Setting SERVER_NAME to server hostname' + SERVER_NAME=$(hostnamectl --static);; * ) # Invalid option echo "Error: Invalid option" exit;;