From 3ddc95d4b5009f33d3711e32f04247fc4c317577 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 31 Mar 2021 11:01:53 +0200
Subject: [PATCH] :tada: Add nginx config file inside devenv image.

---
 docker/devenv/Dockerfile          | 25 ++++++++++++++++++-------
 docker/devenv/docker-compose.yaml |  1 -
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile
index db151af6a..a8c6e002a 100644
--- a/docker/devenv/Dockerfile
+++ b/docker/devenv/Dockerfile
@@ -5,7 +5,8 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 ENV NODE_VERSION=v14.16.0 \
     CLOJURE_VERSION=1.10.3.814 \
-    CLJKONDO_VERSION=2021.03.03 \
+    CLJKONDO_VERSION=2021.03.22 \
+    BABASHKA_VERSION=0.3.1 \
     LANG=en_US.UTF-8 \
     LC_ALL=en_US.UTF-8
 
@@ -26,6 +27,7 @@ RUN set -ex; \
         git \
         rlwrap \
         unzip \
+        fakeroot \
     ; \
     echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \
     locale-gen; \
@@ -115,8 +117,6 @@ RUN set -ex; \
     apt-get -qqy install postgresql-client-13; \
     rm -rf /var/lib/apt/lists/*;
 
-WORKDIR /home
-
 RUN set -ex; \
     curl -LfsSo /tmp/nodejs.tar.xz https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-linux-x64.tar.xz; \
     mkdir -p /usr/local/nodejs; \
@@ -128,12 +128,22 @@ RUN set -ex; \
     /usr/local/nodejs/bin/npm install -g svgo; \
     rm -rf /tmp/nodejs.tar.xz;
 
+# Install clj-kondo
+RUN set -ex; \
+    curl -LfsSo /tmp/clj-kondo.zip https://github.com/borkdude/clj-kondo/releases/download/v$CLJKONDO_VERSION/clj-kondo-$CLJKONDO_VERSION-linux-amd64.zip; \
+    cd /usr/local/bin; \
+    unzip /tmp/clj-kondo.zip; \
+    rm /tmp/clj-kondo.zip;
+
+# Install babashka
 RUN set -ex; \
     cd /tmp; \
-    wget https://github.com/borkdude/clj-kondo/releases/download/v$CLJKONDO_VERSION/clj-kondo-$CLJKONDO_VERSION-linux-amd64.zip; \
-    unzip clj-kondo-$CLJKONDO_VERSION-linux-amd64.zip; \
-    mv clj-kondo /usr/local/bin/; \
-    rm clj-kondo-$CLJKONDO_VERSION-linux-amd64.zip;
+    curl -LfsSo /tmp/babashka.tar.gz https://github.com/babashka/babashka/releases/download/v$BABASHKA_VERSION/babashka-$BABASHKA_VERSION-linux-amd64.tar.gz; \
+    cd /usr/local/bin; \
+    tar -xf /tmp/babashka.tar.gz; \
+    rm -rf /tmp/babashka.tar.gz;
+
+WORKDIR /home
 
 EXPOSE 3447
 EXPOSE 3448
@@ -141,6 +151,7 @@ EXPOSE 3449
 EXPOSE 6060
 EXPOSE 9090
 
+COPY files/nginx.conf /etc/nginx/nginx.conf
 COPY files/phantomjs-mock /usr/bin/phantomjs
 
 COPY files/bashrc         /root/.bashrc
diff --git a/docker/devenv/docker-compose.yaml b/docker/devenv/docker-compose.yaml
index 22c506b2c..5b75684b7 100644
--- a/docker/devenv/docker-compose.yaml
+++ b/docker/devenv/docker-compose.yaml
@@ -27,7 +27,6 @@ services:
     volumes:
       - "user_data:/home/penpot/"
       - "${PWD}:/home/penpot/penpot"
-      - ./files/nginx.conf:/etc/nginx/nginx.conf
 
     ports:
       - 3447:3447