Split dev docker-container into two containers

This commit is contained in:
Jan Bader 2022-03-17 19:41:24 +00:00
parent 8eabf3d1c8
commit 4798cb95b0
4 changed files with 21 additions and 8 deletions

View File

@ -93,9 +93,9 @@ tasks:
dev-docker: dev-docker:
desc: Build budgeeter:dev desc: Build budgeeter:dev
sources: sources:
- ./docker/Dockerfile - ./docker/Dockerfile.dev
- ./docker/build.sh
- ./web/package.json - ./web/package.json
- ./web/yarn.lock
cmds: cmds:
- docker build -t {{.IMAGE_NAME}}:dev . -f docker/Dockerfile.dev - docker build -t {{.IMAGE_NAME}}:dev . -f docker/Dockerfile.dev
- docker push {{.IMAGE_NAME}}:dev - docker push {{.IMAGE_NAME}}:dev

View File

@ -14,4 +14,3 @@ ADD web/package.json web/yarn.lock /src/web/
RUN yarn RUN yarn
WORKDIR /src WORKDIR /src
COPY --from=godeps /root/go/bin/task /root/go/bin/sqlc /root/go/bin/golangci-lint /usr/local/bin/ COPY --from=godeps /root/go/bin/task /root/go/bin/sqlc /root/go/bin/golangci-lint /usr/local/bin/
CMD /dev.sh

View File

@ -1,18 +1,17 @@
version: '3.7' version: '3.7'
services: services:
app: backend:
image: hub.javil.eu/budgeteer:dev image: hub.javil.eu/budgeteer:dev
container_name: budgeteer container_name: budgeteer
command: task -w run
stdin_open: true # docker run -i stdin_open: true # docker run -i
tty: true # docker run -t tty: true # docker run -t
ports: ports:
- 1323:1323 - 1323:1323
- 3000:3000
user: '1000' user: '1000'
volumes: volumes:
- ~/budgeteer:/src - ~/budgeteer:/src
- ~/.gitconfig:/.gitconfig
- ~/.go:/go - ~/.go:/go
- ~/.cache:/.cache - ~/.cache:/.cache
environment: environment:
@ -21,6 +20,21 @@ services:
depends_on: depends_on:
- db - 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: db:
image: postgres:14 image: postgres:14
ports: ports:

View File

@ -19,7 +19,7 @@ export default defineConfig({
host: "0.0.0.0", host: "0.0.0.0",
proxy: { proxy: {
"/api": { "/api": {
target: "http://10.0.0.162:1323/", target: "http://backend:1323/",
changeOrigin: true, changeOrigin: true,
}, },
}, },