From bba8f0642287d20f3d38467617ac4d912ed35ff0 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Fri, 7 Feb 2020 18:28:24 +0100
Subject: [PATCH] Bump python, postgres, postgis to Alpine 3.11

---
 lxc-services/postgis/image            | 12 ++++++++++++
 lxc-services/postgis/lxcfile          | 11 -----------
 lxc-services/postgres/image           | 15 +++++++++++++++
 lxc-services/postgres/lxcfile         | 19 -------------------
 lxc-shared/alpine3.11-python2.7/image |  8 ++++++++
 lxc-shared/alpine3.11-python3.8/image |  9 +++++++++
 lxc-shared/alpine3.11/image           | 14 ++++++++++++++
 7 files changed, 58 insertions(+), 30 deletions(-)
 create mode 100644 lxc-services/postgis/image
 delete mode 100644 lxc-services/postgis/lxcfile
 create mode 100644 lxc-services/postgres/image
 delete mode 100644 lxc-services/postgres/lxcfile
 create mode 100644 lxc-shared/alpine3.11-python2.7/image
 create mode 100644 lxc-shared/alpine3.11-python3.8/image
 create mode 100644 lxc-shared/alpine3.11/image

diff --git a/lxc-services/postgis/image b/lxc-services/postgis/image
new file mode 100644
index 0000000..3666fac
--- /dev/null
+++ b/lxc-services/postgis/image
@@ -0,0 +1,12 @@
+IMAGE postgis_3.0.0-200207
+FROM postgres_12.1.0-200207
+
+USER root
+
+RUN EOF
+    # Install PostGIS
+    apk --no-cache add postgis
+EOF
+
+USER postgres
+CMD postgres -D /var/lib/postgresql
diff --git a/lxc-services/postgis/lxcfile b/lxc-services/postgis/lxcfile
deleted file mode 100644
index 5da3e3a..0000000
--- a/lxc-services/postgis/lxcfile
+++ /dev/null
@@ -1,11 +0,0 @@
-IMAGE postgis_2.5.1-190620
-FROM postgres_11.3.0-190620
-
-RUN EOF
-    # Install PostGIS
-    apk --no-cache add postgis@vm
-EOF
-
-USER 5432 5432
-CMD postgres -D /var/lib/postgresql
-READY pg_isready
diff --git a/lxc-services/postgres/image b/lxc-services/postgres/image
new file mode 100644
index 0000000..94baa67
--- /dev/null
+++ b/lxc-services/postgres/image
@@ -0,0 +1,15 @@
+IMAGE postgres_12.1.0-200207
+FROM alpine3.11_3.11.3-200207
+
+RUN EOF
+    # Install PostgreSQL
+    apk --no-cache add postgresql postgresql-contrib
+
+    # Create socket directory 
+    mkdir /run/postgresql
+    chown postgres:postgres /run/postgresql
+EOF
+
+USER postgres
+CMD postgres -D /var/lib/postgresql
+READY pg_isready
diff --git a/lxc-services/postgres/lxcfile b/lxc-services/postgres/lxcfile
deleted file mode 100644
index 9ffe4c2..0000000
--- a/lxc-services/postgres/lxcfile
+++ /dev/null
@@ -1,19 +0,0 @@
-IMAGE postgres_11.3.0-190620
-FROM alpine3.9_3.9.4-190620
-
-RUN EOF
-    # Modify OS user (which will be picked up later by apk add)
-    sed -i 's/postgres:x:70:70/postgres:x:5432:5432/' /etc/passwd
-    sed -i 's/postgres:x:70/postgres:x:5432/' /etc/group
-
-    # Install PostgreSQL
-    apk --no-cache add postgresql postgresql-contrib
-
-    # Create socket directory 
-    mkdir /run/postgresql
-    chown postgres:postgres /run/postgresql
-EOF
-
-USER 5432 5432
-CMD postgres -D /var/lib/postgresql
-READY pg_isready
diff --git a/lxc-shared/alpine3.11-python2.7/image b/lxc-shared/alpine3.11-python2.7/image
new file mode 100644
index 0000000..b2d90ee
--- /dev/null
+++ b/lxc-shared/alpine3.11-python2.7/image
@@ -0,0 +1,8 @@
+IMAGE alpine3.11-python2.7_2.7.16-200207
+FROM alpine3.11_3.11.3-200207
+
+RUN EOF
+    apk --no-cache add python2
+EOF
+
+CMD python
diff --git a/lxc-shared/alpine3.11-python3.8/image b/lxc-shared/alpine3.11-python3.8/image
new file mode 100644
index 0000000..a1b6c8e
--- /dev/null
+++ b/lxc-shared/alpine3.11-python3.8/image
@@ -0,0 +1,9 @@
+IMAGE alpine3.11-python3.8_3.8.1-200207
+FROM alpine3.11_3.11.3-200207
+
+RUN EOF
+    apk --no-cache add python3
+    ln -s /usr/bin/python3 /usr/bin/python
+EOF
+
+CMD python
diff --git a/lxc-shared/alpine3.11/image b/lxc-shared/alpine3.11/image
new file mode 100644
index 0000000..1ee04aa
--- /dev/null
+++ b/lxc-shared/alpine3.11/image
@@ -0,0 +1,14 @@
+IMAGE alpine3.11_3.11.3-200207
+
+COPY https://github.com/alpinelinux/docker-alpine/raw/v3.11/x86_64/alpine-minirootfs-3.11.3-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