fix some issues and clean up some docker related stuff
This commit is contained in:
parent
51e7af4e2f
commit
6e56ad5c7f
2
.env
2
.env
|
@ -1,2 +1,2 @@
|
|||
DATABASE_URL=postgres://apfel:apfel@postgres:5432/apfel
|
||||
DATABASE_URL=postgres://apfel:apfel@localhostc:5432/apfel
|
||||
TOKEN_SECRET=9b2cbd156a7a7e0e530acd780fdd16e8f37fa3fd8122c74a9b7e1ce6fc67980ed0e55572be4e382679a0c13d13f0a651d15e9e877bb579e957c899eb762b1bb4
|
|
@ -17,23 +17,24 @@ services:
|
|||
backend:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile-backend
|
||||
dockerfile: docker/Dockerfile-backend
|
||||
ports:
|
||||
- "8080:8080"
|
||||
networks:
|
||||
- apfelnetzwerk
|
||||
depends_on:
|
||||
- postgres
|
||||
env_file:
|
||||
- .env
|
||||
environment:
|
||||
- DATABASE_URL=postgres://apfel:apfel@postgres:5432/apfel
|
||||
- TOKEN_SECRET=9b2cbd156a7a7e0e530acd780fdd16e8f37fa3fd8122c74a9b7e1ce6fc67980ed0e55572be4e382679a0c13d13f0a651d15e9e877bb579e957c899eb762b1bb4
|
||||
restart: unless-stopped
|
||||
|
||||
frontend:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile-frontend
|
||||
dockerfile: docker/Dockerfile-frontend
|
||||
ports:
|
||||
- "3000:3000"
|
||||
- "8000:8000"
|
||||
depends_on:
|
||||
- backend
|
||||
restart: unless-stopped
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
FROM rust:latest
|
||||
|
||||
COPY ./crates/ ./crates/
|
||||
COPY ./Cargo.toml ./
|
||||
COPY ./Cargo.lock ./
|
||||
COPY ../crates ./crates/
|
||||
COPY ../Cargo.toml ./
|
||||
COPY ../Cargo.lock ./
|
||||
|
||||
RUN cargo build --release
|
||||
|
|
@ -18,5 +18,5 @@ RUN pnpm run buildNoCheck
|
|||
FROM base
|
||||
COPY --from=prod-deps /app/node_modules /app/node_modules
|
||||
COPY --from=build /app/dist /app/dist
|
||||
EXPOSE 3000
|
||||
EXPOSE 8000
|
||||
CMD [ "pnpm", "start" ]
|
|
@ -6,7 +6,7 @@
|
|||
"build": "vue-tsc --noEmit && vite build",
|
||||
"buildNoCheck": "vite build",
|
||||
"preview": "vite preview",
|
||||
"start": "vite preview --port 3000"
|
||||
"start": "vite preview --port 8000 --host"
|
||||
},
|
||||
"dependencies": {
|
||||
"@mdi/font": "6.2.95",
|
||||
|
|
Loading…
Reference in a new issue