From 61ab0b0b48f415e2a48aadd7c8bd0823c45b3fd7 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Fri, 13 Mar 2020 20:39:52 +0100
Subject: [PATCH] Using tech scheduled to EOL 5 years ago should be a criminal
 offense

---
 lxc-apps/ckan/app                     |  2 +-
 lxc-apps/ckan/ckan-datapusher.image   |  6 +++---
 lxc-shared/alpine3.10-python2.7/image |  8 ++++++++
 lxc-shared/alpine3.10/image           | 14 ++++++++++++++
 lxc-shared/alpine3.8/image            |  2 +-
 5 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 lxc-shared/alpine3.10-python2.7/image
 create mode 100644 lxc-shared/alpine3.10/image

diff --git a/lxc-apps/ckan/app b/lxc-apps/ckan/app
index 8dd76be..0fc9854 100644
--- a/lxc-apps/ckan/app
+++ b/lxc-apps/ckan/app
@@ -21,7 +21,7 @@
             }
         },
         "ckan-datapusher": {
-            "image": "ckan-datapusher_0.0.15-200313",
+            "image": "ckan-datapusher_0.0.16-200313",
             "mounts": {
                 "ckan/datapusher_conf": "etc/ckan-datapusher",
                 "ckan/datapusher_data": "srv/ckan-datapusher/data"
diff --git a/lxc-apps/ckan/ckan-datapusher.image b/lxc-apps/ckan/ckan-datapusher.image
index da337a4..7237b90 100644
--- a/lxc-apps/ckan/ckan-datapusher.image
+++ b/lxc-apps/ckan/ckan-datapusher.image
@@ -1,5 +1,5 @@
-IMAGE ckan-datapusher_0.0.15-200313
-FROM alpine3.11-python2.7_2.7.16-200313
+IMAGE ckan-datapusher_0.0.16-200313
+FROM alpine3.10-python2.7_2.7.16-200313
 
 RUN EOF
     # Install runtime dependencies
@@ -12,7 +12,7 @@ RUN EOF
     mkdir -p /srv/ckan-datapusher
     cd /srv/ckan-datapusher
     pip install -U setuptools
-    pip install -e 'git+https://github.com/ckan/datapusher.git@3926f14a5fd2143cfa005eede6588b35c4a07513#egg=datapusher'
+    pip install -e 'git+https://github.com/ckan/datapusher.git@e662e3c33e069ac174cdb4fb1d61121f0ba4bb3a#egg=datapusher'
 
     # Create OS user
     addgroup -S -g 8080 ckandp
diff --git a/lxc-shared/alpine3.10-python2.7/image b/lxc-shared/alpine3.10-python2.7/image
new file mode 100644
index 0000000..db7dbe5
--- /dev/null
+++ b/lxc-shared/alpine3.10-python2.7/image
@@ -0,0 +1,8 @@
+IMAGE alpine3.10-python2.7_2.7.16-200313
+FROM alpine3.10_3.10.4-200313
+
+RUN EOF
+    apk --no-cache add python2
+EOF
+
+CMD /usr/bin/python
diff --git a/lxc-shared/alpine3.10/image b/lxc-shared/alpine3.10/image
new file mode 100644
index 0000000..0e3c881
--- /dev/null
+++ b/lxc-shared/alpine3.10/image
@@ -0,0 +1,14 @@
+IMAGE alpine3.10_3.10.4-200313
+
+COPY https://github.com/alpinelinux/docker-alpine/raw/v3.10/x86_64/alpine-minirootfs-3.10.4-x86_64.tar.gz
+
+RUN EOF
+    # Update packages
+    apk --no-cache upgrade
+
+    # Install common packages
+    apk --no-cache add libbz2 libgcc libressl libstdc++ libxml2 libxslt ncurses-libs pcre readline s6 xz-libs
+
+    # Cleanup
+    rm -rf /etc/crontabs/root /etc/periodic
+EOF
diff --git a/lxc-shared/alpine3.8/image b/lxc-shared/alpine3.8/image
index 9c35478..2df077d 100644
--- a/lxc-shared/alpine3.8/image
+++ b/lxc-shared/alpine3.8/image
@@ -1,6 +1,6 @@
 IMAGE alpine3.8_3.8.5-200313
 
-COPY https://github.com/gliderlabs/docker-alpine/raw/rootfs/library-3.8/x86_64/versions/library-3.8/x86_64/rootfs.tar.xz
+COPY https://github.com/alpinelinux/docker-alpine/raw/v3.8/x86_64/alpine-minirootfs-3.8.5-x86_64.tar.gz
 
 RUN EOF
     # Update packages