🐳 Improve devenv and build steps (jvm-opts and upgrades).

backend/bin/start-dev

@@ -8,7 +8,6 @@ if [ ! -e ~/local/.fixtures-loaded ]; then
     touch ~/local/.fixtures-loaded
 fi
 
-clojure -J-XX:-OmitStackTraceInFastThrow -m uxbox.main
-
+clojure ${CLOJURE_OPTS} -m uxbox.main
 
 

backend/bin/start-prod

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+clojure ${CLOJURE_OPTIONS} -m uxbox.main

backend/deps.edn

@@ -61,12 +61,17 @@
   :test
   {:extra-deps {lambdaisland/kaocha {:mvn/version "0.0-554"}}}
 
-  :nrepl
-  {:extra-deps {nrepl/nrepl {:mvn/version "0.6.0"}}
-   :main-opts ["-m" "nrepl.cmdline"]}
-
   :ancient
   {:main-opts ["-m" "deps-ancient.deps-ancient"]
    :extra-deps {deps-ancient {:mvn/version "RELEASE"}}}
 
+  :jmx-remote
+  {:jvm-opts ["-Dcom.sun.management.jmxremote"
+              "-Dcom.sun.management.jmxremote.port=9090"
+              "-Dcom.sun.management.jmxremote.rmi.port=9090"
+              "-Dcom.sun.management.jmxremote.local.only=false"
+              "-Dcom.sun.management.jmxremote.authenticate=false"
+              "-Dcom.sun.management.jmxremote.ssl=false"
+              "-Djava.rmi.server.hostname=localhost"]}
+
   }}

docker/backend/Dockerfile

@@ -1,7 +1,7 @@
 FROM azul/zulu-openjdk:12
 LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
 
-ENV CLOJURE_VERSION=1.10.1.469 \
+ENV CLOJURE_VERSION=1.10.1.492 \
     LANG=en_US.UTF-8 \
     LC_ALL=C.UTF-8
 
@@ -33,4 +33,4 @@ WORKDIR /srv/uxbox/
 EXPOSE 6060
 
 ENTRYPOINT ["bash", "/entrypoint.sh"]
-CMD ["clojure", "-m", "uxbox.main"]
+CMD ["/srv/uxbox/bin/start-prod"]

docker/devenv/Dockerfile

@@ -5,7 +5,7 @@ ARG EXTERNAL_UID=1000
 ARG DEBIAN_FRONTEND=noninteractive
 
 ENV NODE_VERSION=v10.16.3 \
-    CLOJURE_VERSION=1.10.1.469 \
+    CLOJURE_VERSION=1.10.1.492 \
     LANG=en_US.UTF-8 \
     LC_ALL=C.UTF-8
 
@@ -86,10 +86,10 @@ RUN set -ex; \
 COPY files/bashrc /home/uxbox/.bashrc
 COPY files/zshrc /home/uxbox/.zshrc
 COPY files/vimrc /home/uxbox/.vimrc
-COPY files/start.sh /home/uxbox/start.sh
+COPY files/start-tmux.sh /home/uxbox/start-tmux.sh
 COPY files/tmux.conf /home/uxbox/.tmux.conf
 COPY files/entrypoint.sh /home/uxbox/
 COPY files/init.sh /home/uxbox/
 
 ENTRYPOINT ["zsh", "/home/uxbox/entrypoint.sh"]
-CMD ["/home/uxbox/start.sh"]
+CMD ["/home/uxbox/init.sh"]

docker/devenv/docker-compose.yaml

@@ -35,6 +35,7 @@ services:
       - 9090:9090
 
     environment:
+      - CLOJURE_OPTS="-J-XX:-OmitStackTraceInFastThrow"
       - UXBOX_DATABASE_URI="postgresql://postgres/uxbox"
       - UXBOX_DATABASE_USERNAME="uxbox"
       - UXBOX_DATABASE_PASSWORD="uxbox"

docker/devenv/files/entrypoint.sh

@@ -1,3 +1,4 @@
 #!/usr/bin/env zsh
+
 set -ex
 exec "$@"

docker/devenv/files/start-tmux.sh

@@ -10,7 +10,7 @@ tmux send-keys -t uxbox 'clojure -Adev tools.clj figwheel' enter
 tmux new-window -t uxbox:2 -n 'backend'
 tmux select-window -t uxbox:2
 tmux send-keys -t uxbox 'cd uxbox/backend' enter C-l
-tmux send-keys -t uxbox './bin/start' enter
+tmux send-keys -t uxbox './bin/start-dev' enter
 
 tmux rename-window -t uxbox:0 'gulp'
 tmux select-window -t uxbox:0

manage.sh

@@ -37,7 +37,7 @@ function run-devenv {
         start-devenv
     fi
 
-    docker exec -ti uxboxdev-main /home/uxbox/start.sh;
+    docker exec -ti uxboxdev-main /home/uxbox/start-tmux.sh
 }
 
 function run-all-tests {