From 49f5a8c5aedbeb9a9fe2e36c04c4be05351f2c43 Mon Sep 17 00:00:00 2001
From: Fabian Schindler <fabian.schindler.strauss@gmail.com>
Date: Mon, 23 Mar 2020 16:38:49 +0100
Subject: [PATCH] Installing mapache (specific version) from our own apt
repository
---
cache/Dockerfile | 3 ---
cache/install.sh | 10 +++++-----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/cache/Dockerfile b/cache/Dockerfile
index 9a6ae7c7..8befa063 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 6048eb7a..3bc64ae9 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/*
--
GitLab