Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
e06ffa51a3
5 changed files with 26 additions and 1 deletions
|
|
@ -1,5 +1,6 @@
|
|||
POSTGRES_PORT=5432
|
||||
EXPRESS_PORT=3000
|
||||
FRONTEND_PORT=8080
|
||||
|
||||
POSTGRES_USER=postgres
|
||||
POSTGRES_PASSWORD=postgres
|
||||
|
|
|
|||
|
|
@ -21,3 +21,13 @@ services:
|
|||
ports:
|
||||
- "${EXPRESS_PORT}:3000"
|
||||
|
||||
vue:
|
||||
build: frontend
|
||||
container_name: frontend
|
||||
ports:
|
||||
- "${FRONTEND_PORT}:8080"
|
||||
|
||||
|
||||
volumes:
|
||||
- ./frontend:/app
|
||||
|
||||
|
|
|
|||
3
frontend/.dockerignore
Normal file
3
frontend/.dockerignore
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
node_modules
|
||||
.gitignore
|
||||
README.md
|
||||
11
frontend/Dockerfile
Normal file
11
frontend/Dockerfile
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
FROM node:18
|
||||
|
||||
COPY . /app
|
||||
WORKDIR /app
|
||||
|
||||
RUN npm install
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
ENTRYPOINT ["npm", "run", "serve"]
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<h2>Enter a username</h2>
|
||||
<div class="form-floating mb-3">
|
||||
<input type="email" class="form-control" id="floatingInput" placeholder="example name" v-model="username">
|
||||
<input class="form-control" id="floatingInput" placeholder="example name" v-model="username">
|
||||
<label for="floatingInput">Username</label>
|
||||
<RRButton @click="setUser()" text="Confirm"></RRButton>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue