misc: improve management scripts

docker/devenv/Dockerfile

@@ -30,12 +30,12 @@ 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; \
+    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  \
-        postgresql-9.6 \
-        postgresql-contrib-9.6 \
+        postgresql-11 \
+        postgresql-contrib-11 \
     ;\
     rm -rf /var/lib/apt/lists/*;
 
@@ -43,7 +43,7 @@ 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/9.6/main/pg_hba.conf
+COPY files/pg_hba.conf /etc/postgresql/11/main/pg_hba.conf
 COPY files/bashrc /root/.bashrc
 COPY files/vimrc /root/.vimrc
 

docker/devenv/files/entrypoint.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env zsh
-set -e
-echo "UXBOX Docker Dev entrypoint initialization..."
+set -ex
+sudo pg_ctlcluster 11 main start
 
 exec "$@"

docker/devenv/files/start.sh

@@ -13,10 +13,6 @@ tmux send-keys -t uxbox 'cd uxbox/backend' enter C-l
 tmux send-keys -t uxbox 'clojure -Adev -m uxbox.fixtures' enter C-l
 tmux send-keys -t uxbox 'clojure -Adev:repl' enter
 
-tmux new-window -t uxbox:3 -n 'services'
-tmux select-window -t uxbox:3
-tmux send-keys -t uxbox 'sudo pg_ctlcluster 9.6 main start' enter
-
 tmux rename-window -t uxbox:0 'gulp'
 tmux select-window -t uxbox:0
 tmux send-keys -t uxbox 'cd uxbox/frontend' enter C-l

docker/docker-compose.yml

@@ -10,11 +10,11 @@ networks:
     driver: bridge
     ipam:
       config:
-        - subnet: 172.177.57.0/24
+        - subnet: 172.177.12.0/24
 
 services:
   uxdb:
-    image: postgres:latest
+    image: postgres:11
     container_name: uxdb
     restart: always
     ports:
@@ -32,7 +32,7 @@ services:
   uxbackend:
     image: uxbox-backend:latest
     container_name: uxbackend
-    restart: always
+    # restart: always
     depends_on:
       - uxdb
     ports:

docker/release.backend/Dockerfile

@@ -32,5 +32,5 @@ WORKDIR /srv/uxbox/
 
 EXPOSE 6060
 
-ENTRYPOINT ["sh", "/entrypoint.sh"]
+ENTRYPOINT ["bash", "/entrypoint.sh"]
 CMD ["clojure", "-m", "uxbox.main"]

docker/release.frontend/Dockerfile

@@ -1,4 +1,3 @@
-# Once application has been built, prepare production image
 FROM nginx:alpine
 
 LABEL maintainer="Monogramm Maintainers <opensource at monogramm dot io>"