From 841ace3aa8ea90a70f5b7398f03afc05bc0512f2 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Tue, 4 Feb 2020 12:35:55 +0100
Subject: [PATCH] :whale: Update openjdk 11 -> 13 (docker).

---
 docker/buildenv/Dockerfile | 11 +++++++++--
 docker/devenv/Dockerfile   | 18 ++++++++++++++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/docker/buildenv/Dockerfile b/docker/buildenv/Dockerfile
index c4fb80cc92..c32afd52a6 100644
--- a/docker/buildenv/Dockerfile
+++ b/docker/buildenv/Dockerfile
@@ -3,7 +3,7 @@ LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
 ARG DEBIAN_FRONTEND=noninteractive
 
 ENV NODE_VERSION=v12.14.1 \
-    CLOJURE_VERSION=1.10.1.492 \
+    CLOJURE_VERSION=1.10.1.507 \
     LANG=en_US.UTF-8 \
     LC_ALL=C.UTF-8
 
@@ -26,10 +26,17 @@ RUN set -ex; \
         rlwrap \
         python \
         build-essential \
-        openjdk-11-jdk \
     ; \
     rm -rf /var/lib/apt/lists/*;
 
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9 && \
+    echo "deb http://repos.azulsystems.com/debian stable  main" >> /etc/apt/sources.list.d/zulu.list && \
+    apt-get -qq update && \
+    apt-get -qqy install zulu-13 && \
+    rm -rf /var/lib/apt/lists/*;
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-amd64/
+
 COPY files/bashrc /root/.bashrc
 COPY files/vimrc /root/.vimrc
 COPY files/entrypoint.sh /entrypoint.sh
diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile
index 555bb80419..10af553c91 100644
--- a/docker/devenv/Dockerfile
+++ b/docker/devenv/Dockerfile
@@ -5,7 +5,7 @@ ARG EXTERNAL_UID=1000
 ARG DEBIAN_FRONTEND=noninteractive
 
 ENV NODE_VERSION=v12.14.1 \
-    CLOJURE_VERSION=1.10.1.492 \
+    CLOJURE_VERSION=1.10.1.507 \
     LANG=en_US.UTF-8 \
     LC_ALL=C.UTF-8
 
@@ -32,10 +32,24 @@ RUN set -ex; \
         build-essential \
         imagemagick \
         webp \
-        openjdk-11-jdk \
+        jq \
     ; \
     rm -rf /var/lib/apt/lists/*;
 
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9 && \
+    echo "deb http://repos.azulsystems.com/debian stable  main" >> /etc/apt/sources.list.d/zulu.list && \
+    apt-get -qq update && \
+    apt-get -qqy install zulu-13 && \
+    rm -rf /var/lib/apt/lists/*;
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-amd64/
+
+RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - && \
+    echo "deb http://apt.postgresql.org/pub/repos/apt buster-pgdg main" >> /etc/apt/sources.list.d/postgresql.list && \
+    apt-get -qq update && \
+    apt-get -qqy install postgresql-client-12 && \
+    rm -rf /var/lib/apt/lists/*;
+
 COPY files/bashrc /root/.bashrc
 COPY files/vimrc /root/.vimrc