diff --git a/infrastrucure/docker/image/resources/entrypoint.sh b/infrastrucure/docker/image/resources/entrypoint.sh deleted file mode 100755 index 72b0870..0000000 --- a/infrastrucure/docker/image/resources/entrypoint.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -function main() { - file_env POSTGRES_DB - file_env POSTGRES_PASSWORD - file_env POSTGRES_USER - - create-pg-pass - - # Idle process - while true; do - sleep 500000 - done -} - -source /usr/local/lib/functions.sh -source /usr/local/lib/pg-functions.sh -main diff --git a/infrastrucure/docker/image/resources/install.sh b/infrastrucure/docker/image/resources/install.sh index 3e43e6a..c27c1c5 100755 --- a/infrastrucure/docker/image/resources/install.sh +++ b/infrastrucure/docker/image/resources/install.sh @@ -10,7 +10,6 @@ apt-get -qqy install wget postgresql-client-13 restic > /dev/null; update-ca-certificates -install -m 0700 /tmp/entrypoint.sh / install -m 0400 /tmp/functions.sh /usr/local/lib/ install -m 0400 /tmp/pg-functions.sh /usr/local/lib/ install -m 0400 /tmp/file-functions.sh /usr/local/lib/ diff --git a/infrastrucure/docker/test/serverspec.edn b/infrastrucure/docker/test/serverspec.edn index 6e0121e..af5be43 100644 --- a/infrastrucure/docker/test/serverspec.edn +++ b/infrastrucure/docker/test/serverspec.edn @@ -1,6 +1,5 @@ {:package [{:name "restic"} {:name "postgresql-client-13"}] - :file [{:path "/entrypoint.sh" :mod "700"} - {:path "/usr/local/lib/functions.sh" :mod "400"} + :file [{:path "/usr/local/lib/functions.sh" :mod "400"} {:path "/usr/local/lib/pg-functions.sh" :mod "400"} {:path "/usr/local/lib/file-functions.sh" :mod "400"}]}