cache: adding entrypoint

cleanup of unused stuff

cache/Dockerfile

@@ -63,11 +63,17 @@ ADD configure.sh \
     run-seeder.sh \
     seeder.py \
     mapcache-template.xml \
+    entrypoint.sh \
     /
+
 RUN chmod -v +x \
     /configure.sh \
     /run-httpd.sh \
-    /run-seeder.sh
+    /run-seeder.sh \
+    /entrypoint.sh
+
+ADD mapcache.xml ${INSTALL_DIR}/
 
 EXPOSE 80
+ENTRYPOINT ["/entrypoint.sh"]
 CMD ["/run-httpd.sh"]

cache/configure.sh

@@ -2,6 +2,7 @@
 echo "Running configure.sh"
 
 echo "Generating directory for seeding logs"
+mkdir -p "${INSTALL_DIR}"
 mkdir -p "/cache-db/${COLLECTION}"
 
 chown -R www-data:www-data "${INSTALL_DIR}"

cache/entrypoint.sh

+#!/bin/bash -e
+
+SERVICES=${WAIT_SERVICES:=''}
+
+if [[ ! -z $SERVICES ]] ; then
+    for service in $SERVICES ; do
+        wait-for-it $service
+    done
+fi
+
+eval "$@"

cache/install.sh

@@ -12,6 +12,6 @@ apt update
 echo "Installing packages"
 DEBIAN_FRONTEND=noninteractive apt install -y \
     libmapcache1=1.8.0-1~bionic1eox2 libapache2-mod-mapcache=1.8.0-1~bionic1eox2 mapcache-tools=1.8.0-1~bionic1eox2 \
-    sqlite3 curl apache2 python3-dateutil python3-redis
+    sqlite3 curl apache2 python3-dateutil python3-redis wait-for-it
 
 rm -rf /var/lib/apt/lists/*

cache/run-httpd.sh

 #!/bin/bash -e
 
-/get-token-and-render.sh
 /configure.sh
 
-echo "Running cron in background"
-service cron start
-
 echo "Running Apache server"
 rm -rf /run/apache2/* /var/run/apache2/* /tmp/apache2*
 exec /usr/sbin/apache2ctl -D FOREGROUND