From 4db8de8d9d4e8f3ca9e21c304bfe67f955226f36 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Tue, 17 Sep 2019 16:14:49 +0000
Subject: [PATCH] :tada: Update devenv: ubuntu:xenial->bionic, java:
 jdk8->jdk12 (zulu-openjdk).

---
 docker/backend/Dockerfile  |  8 ++++----
 docker/devenv/Dockerfile   | 29 +++++++++++++++++------------
 docker/frontend/Dockerfile |  5 ++---
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile
index 913023915..619c8b3c6 100644
--- a/docker/backend/Dockerfile
+++ b/docker/backend/Dockerfile
@@ -1,8 +1,7 @@
-FROM openjdk:8-jre
+FROM azul/zulu-openjdk:12
+LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
 
-LABEL maintainer="Monogramm Maintainers <opensource at monogramm dot io>"
-
-ENV CLOJURE_VERSION=1.10.0.442 \
+ENV CLOJURE_VERSION=1.10.1.469 \
     LANG=en_US.UTF-8 \
     LC_ALL=C.UTF-8
 
@@ -10,6 +9,7 @@ RUN set -ex; \
     apt-get update -yq &&  \
     apt-get install -yq \
         curl \
+        wget \
         rsync \
         git \
         imagemagick \
diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile
index 0a6ddd80c..40d3dc9f1 100644
--- a/docker/devenv/Dockerfile
+++ b/docker/devenv/Dockerfile
@@ -1,10 +1,10 @@
-FROM ubuntu:xenial
+FROM ubuntu:bionic
 LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
 
 ARG EXTERNAL_UID=1000
 
-ENV NODE_VERSION=v10.16.0 \
-    CLOJURE_VERSION=1.10.0.442 \
+ENV NODE_VERSION=v10.16.3 \
+    CLOJURE_VERSION=1.10.1.469 \
     LANG=en_US.UTF-8 \
     LC_ALL=C.UTF-8
 
@@ -12,6 +12,7 @@ RUN set -ex; \
     apt-get update && \
     apt-get install -yq \
         locales \
+        gnupg2 \
         ca-certificates \
         wget \
         sudo \
@@ -21,7 +22,6 @@ RUN set -ex; \
         zsh \
         bash \
         git \
-        openjdk-8-jdk \
         rlwrap \
         build-essential \
         imagemagick \
@@ -30,19 +30,24 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*;
 
 RUN set -ex; \
-    echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main" >> /etc/apt/sources.list; \
-    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -; \
-    apt-get update -yq &&  \
-    apt-get install -yq  \
+    mkdir -p /etc/resolvconf/resolv.conf.d; \
+    echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail; \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9; \
+    curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -; \
+    echo "deb http://repos.azulsystems.com/ubuntu stable main" >> /etc/apt/sources.list.d/zulu.list; \
+    echo "deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main" >> /etc/apt/sources.list.d/postgresql.list;
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN set -ex; \
+    apt-get -qq update; \
+    apt-get install -qqy zulu-12; \
+    apt-get install -qqy \
         postgresql-11 \
         postgresql-contrib-11 \
     ;\
     rm -rf /var/lib/apt/lists/*;
 
-RUN set -ex; \
-    mkdir -p /etc/resolvconf/resolv.conf.d; \
-    echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail;
-
 COPY files/pg_hba.conf /etc/postgresql/11/main/pg_hba.conf
 COPY files/bashrc /root/.bashrc
 COPY files/vimrc /root/.vimrc
diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile
index 9f4563ce8..546d5a78e 100644
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -1,6 +1,5 @@
-FROM nginx:1.17.2
-
-LABEL maintainer="Monogramm Maintainers <opensource at monogramm dot io>"
+FROM nginx:1.17.3
+LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
 
 ENV LANG=en_US.UTF-8 \
     LC_ALL=C.UTF-8