From 4798cb95b060e34405a41a56c3a6b796a22e3e65 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Thu, 17 Mar 2022 19:41:24 +0000
Subject: [PATCH 1/2] Split dev docker-container into two containers

---
 Taskfile.yml                  |  4 ++--
 docker/Dockerfile.dev         |  3 +--
 docker/docker-compose.dev.yml | 20 +++++++++++++++++---
 web/vite.config.js            |  2 +-
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Taskfile.yml b/Taskfile.yml
index d947f38..08508ee 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -93,9 +93,9 @@ tasks:
   dev-docker:
     desc: Build budgeeter:dev
     sources:
-      - ./docker/Dockerfile
-      - ./docker/build.sh
+      - ./docker/Dockerfile.dev
       - ./web/package.json
+      - ./web/yarn.lock
     cmds:
       - docker build -t {{.IMAGE_NAME}}:dev . -f docker/Dockerfile.dev
       - docker push {{.IMAGE_NAME}}:dev
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 07183db..fc8b7d9 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -13,5 +13,4 @@ WORKDIR /src/web
 ADD web/package.json web/yarn.lock /src/web/
 RUN yarn
 WORKDIR /src
-COPY --from=godeps /root/go/bin/task /root/go/bin/sqlc /root/go/bin/golangci-lint /usr/local/bin/
-CMD /dev.sh
+COPY --from=godeps /root/go/bin/task /root/go/bin/sqlc /root/go/bin/golangci-lint /usr/local/bin/
\ No newline at end of file
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 2d907be..23de5b3 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -1,18 +1,17 @@
 version: '3.7'
 
 services:
-        app:
+        backend:
                 image: hub.javil.eu/budgeteer:dev
                 container_name: budgeteer
+                command: task -w run
                 stdin_open: true # docker run -i
                 tty: true        # docker run -t
                 ports:
                         - 1323:1323
-                        - 3000:3000
                 user: '1000' 
                 volumes:
                         - ~/budgeteer:/src
-                        - ~/.gitconfig:/.gitconfig
                         - ~/.go:/go
                         - ~/.cache:/.cache
                 environment:
@@ -21,6 +20,21 @@ services:
                 depends_on:
                         - db
 
+        frontend:
+                image: hub.javil.eu/budgeteer:dev
+                container_name: budgeteer_frontend
+                command: bash -c "cd web; yarn run dev"
+                stdin_open: true # docker run -i
+                tty: true        # docker run -t
+                ports:
+                        - 3000:3000
+                user: '1000' 
+                volumes:
+                        - ~/budgeteer:/src
+                        - ~/.cache:/.cache
+                depends_on:
+                        - backend
+
         db:
                 image: postgres:14
                 ports:
diff --git a/web/vite.config.js b/web/vite.config.js
index ca5283a..bc5d5e7 100644
--- a/web/vite.config.js
+++ b/web/vite.config.js
@@ -19,7 +19,7 @@ export default defineConfig({
         host: "0.0.0.0",
         proxy: {
             "/api": {
-                target: "http://10.0.0.162:1323/",
+                target: "http://backend:1323/",
                 changeOrigin: true,
             },
         },

From 23b7a4dbddf2299df760ec4ac1daa05af954e73e Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Thu, 17 Mar 2022 19:54:45 +0000
Subject: [PATCH 2/2] Remove tmux and dev.sh

---
 docker/Dockerfile.dev | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index fc8b7d9..6b2533d 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -5,8 +5,7 @@ RUN go install github.com/go-task/task/v3/cmd/task@latest
 RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
 
 FROM alpine
-RUN apk --no-cache add go nodejs yarn bash curl git git-perl tmux
-ADD docker/dev.sh /
+RUN apk --no-cache add go nodejs yarn bash curl git git-perl
 RUN yarn global add @vue/cli
 ENV PATH="/root/.yarn/bin/:${PATH}"
 WORKDIR /src/web