diff --git a/abra.sh b/abra.sh index 349d10d..6aeb6ae 100644 --- a/abra.sh +++ b/abra.sh @@ -1,3 +1,2 @@ export NGINX_CONFIG_VERSION=v23 export GEOIP_CONFIG_VERSION=v1 -export ENTRYPOINT_VERSION=v3 diff --git a/compose.yml b/compose.yml index 5595513..2a629e8 100644 --- a/compose.yml +++ b/compose.yml @@ -44,10 +44,6 @@ services: - source: geoip_conf target: /etc/GeoIP.conf mode: 0555 - - source: entrypoint - target: /custom-entrypoint.sh - mode: 0555 - entrypoint: /custom-entrypoint.sh secrets: - db_password - secret_key @@ -122,11 +118,6 @@ services: volumes: - "shiv_data:/root/.shiv" - "geoip_data:/var/lib/GeoIP" - configs: - - source: entrypoint - target: /custom-entrypoint.sh - mode: 0555 - entrypoint: /custom-entrypoint.sh networks: - internal secrets: @@ -219,9 +210,6 @@ configs: name: ${STACK_NAME}_geoip_conf_${GEOIP_CONFIG_VERSION} file: geoip.conf.tmpl template_driver: golang - entrypoint: - name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION} - file: entrypoint.sh secrets: db_password: diff --git a/entrypoint.sh b/entrypoint.sh deleted file mode 100644 index 10c33e7..0000000 --- a/entrypoint.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -set -e - -file_env() { - local var="$1" - local fileVar="${var}_FILE" - local def="${2:-}" - - if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then - echo >&2 "error: both $var and $fileVar are set (but are exclusive)" - exit 1 - fi - - local val="$def" - - if [ "${!var:-}" ]; then - val="${!var}" - elif [ "${!fileVar:-}" ]; then - val="$(< "${!fileVar}")" - fi - - export "$var"="$val" - unset "$fileVar" -} - -file_env DATABASE_PASSWORD -file_env SECRET_KEY -file_env SMTP_PASSWORD -file_env VAPID_PRIVATE_KEY - -/docker-entrypoint.sh