From 8a6d2631450d02ac73dc41d420afe4e6c8174216 Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Sat, 3 Nov 2018 09:57:10 +0100 Subject: [PATCH] :bug: Fix issue #92 by adding API_URL env variable --- docker/Dockerfile | 4 +++- docker/files/start.sh | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f38888b40..d99126222 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,13 +1,15 @@ FROM ubuntu:xenial -MAINTAINER Andrey Antukh +LABEL maintainer="Andrey Antukh " RUN apt-get update && \ apt-get install -yq locales ca-certificates wget && \ rm -rf /var/lib/apt/lists/* RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen RUN locale-gen && update-locale LANG=en_US.UTF-8 LC_ALL=C.UTF-8 + ENV LANG en_US.UTF-8 ENV LC_ALL C.UTF-8 +ENV API_URL http://127.0.0.1:6060/api RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main" >> /etc/apt/sources.list RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - diff --git a/docker/files/start.sh b/docker/files/start.sh index 52d0cb704..156d787e0 100755 --- a/docker/files/start.sh +++ b/docker/files/start.sh @@ -5,6 +5,7 @@ tmux -2 new-session -d -s uxbox tmux new-window -t uxbox:1 -n 'figwheel' tmux select-window -t uxbox:1 tmux send-keys -t uxbox 'cd uxbox/frontend' enter C-l +tmux send-keys -t uxbox "sed -i -e 's/\"uxbox.config.url\" \".*\"/\"uxbox.config.url\" \"${API_URL}\"/g' figwheel.clj" enter C-l tmux send-keys -t uxbox 'npm run figwheel' enter tmux new-window -t uxbox:2 -n 'backend'