From 38dae51a7aea8baf8c689c2aed9dc7ce20e24d85 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sun, 19 Feb 2023 17:48:25 +0100
Subject: [PATCH] Unify with gvaldap/gvaweb

---
 Dockerfile | 8 ++++++--
 gva.sh     | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index be47096..1cd97eb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,6 +31,10 @@ RUN /root/.local/bin/poetry install --only=main
 FROM debian:$DEBIAN_RELEASE
 LABEL maintainer="Jan Dittberner <jan@dittberner.info>"
 
+ENV LC_ALL=C.UTF-8
+ENV LANG=C.UTF-8
+ENV DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
        ca-certificates \
@@ -63,6 +67,6 @@ VOLUME /srv/$GVAAPP
 
 EXPOSE 8000
 
-COPY gva.sh /srv/
+COPY ${GVAAPP}.sh /srv/
 
-ENTRYPOINT ["dumb-init", "/srv/gva.sh"]
+ENTRYPOINT ["dumb-init", "/srv/${GVAAPP}.sh"]
diff --git a/gva.sh b/gva.sh
index 3ca009c..2314974 100755
--- a/gva.sh
+++ b/gva.sh
@@ -7,8 +7,9 @@ DB_PORT="${GVA_PGSQL_PORT:-5432}"
 DB_USER="${GVA_PGSQL_USER:-gnuviechadmin}"
 DB_NAME="${GVA_PGSQL_DATABASE:-gnuviechadmin}"
 
-until pg_isready -q -h "${DB_HOST}" -p "${DB_PORT}" -U "${PG_USER}" -d "${DB_NAME}"
+until pg_isready -q -h "${DB_HOST}" -p "${DB_PORT}" -U "${DB_USER}" -d "${DB_NAME}"
 do
+  # shellcheck disable=SC2039
   echo -n "."
   sleep 1
 done