diff --git a/cache/Dockerfile b/cache/Dockerfile index 9a6ae7c705bd281cf0a9d9aa0284e16063e42724..8befa063e6c57b4777d39bdd1f0f148c1b94da94 100644 --- a/cache/Dockerfile +++ b/cache/Dockerfile @@ -62,7 +62,6 @@ ADD configure.sh \ run-httpd.sh \ run-seeder.sh \ seeder.py \ - get-token-and-render.sh \ mapcache-template.xml \ / RUN chmod -v +x \ @@ -70,7 +69,5 @@ RUN chmod -v +x \ /run-httpd.sh \ /run-seeder.sh -ADD reload-http /etc/cron.d/ - EXPOSE 80 CMD ["/run-httpd.sh"] diff --git a/cache/install.sh b/cache/install.sh index 6048eb7a54cdbeb584a0fcec2df03651fbe5e4c6..3bc64ae985d1df29267dc9e66d905074417732d5 100755 --- a/cache/install.sh +++ b/cache/install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e echo "Running install.sh" apt update @@ -6,12 +6,12 @@ apt update echo "Adding UbuntuGIS repo" DEBIAN_FRONTEND=noninteractive apt install -y software-properties-common add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable +add-apt-repository -y ppa:schpidi2/eox apt update echo "Installing packages" -DEBIAN_FRONTEND=noninteractive apt install -y libapache2-mod-mapcache \ - mapcache-tools sqlite3 curl apache2 python3-dateutil python3-redis \ - python3-boto3 cron \ - python3-swiftclient python-swiftclient +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 rm -rf /var/lib/apt/lists/*