Split dev docker-container into two containers
This commit is contained in:
parent
8eabf3d1c8
commit
4798cb95b0
@ -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
|
||||
|
@ -14,4 +14,3 @@ 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
|
||||
|
@ -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:
|
||||
|
@ -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,
|
||||
},
|
||||
},
|
||||
|
Loading…
x
Reference in New Issue
Block a user