mirror of
https://github.com/Team4388/scouting-2021.git
synced 2026-06-08 16:28:02 -06:00
fixed docker settings
This commit is contained in:
+10
-7
@@ -1,9 +1,12 @@
|
||||
FROM node:16.9.1-alpine3.11
|
||||
FROM node:16-alpine as build-step
|
||||
RUN mkdir /app
|
||||
WORKDIR /app
|
||||
COPY package*.json ./
|
||||
ENV PATH /app/node_modules/.bin:$PATH
|
||||
COPY package*.json /app
|
||||
RUN npm install
|
||||
# COPY . ./
|
||||
EXPOSE 3000
|
||||
RUN chown -R node /app/node_modules
|
||||
USER node
|
||||
CMD [ "npm", "start"]
|
||||
COPY . /app
|
||||
# USER node
|
||||
RUN npm run build
|
||||
|
||||
FROM nginx:1-alpine
|
||||
COPY --from=build-step /app/build /usr/share/nginx/html
|
||||
+6
-5
@@ -12,13 +12,14 @@
|
||||
"react-dom": "^17.0.2",
|
||||
"react-router-dom": "^5.3.0",
|
||||
"react-scripts": "4.0.3",
|
||||
"web-vitals": "^1.1.2"
|
||||
"web-vitals": "^1.1.2",
|
||||
"serve": "^12.0.1"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "./node_modules/.bin/react-scripts start",
|
||||
"build": "./node_modules/.bin/react-scripts build",
|
||||
"test": "./node_modules/.bin/react-scripts test",
|
||||
"eject": "./node_modules/.bin/react-scripts eject"
|
||||
"start": "react-scripts start",
|
||||
"build": "react-scripts build",
|
||||
"test": "react-scripts test",
|
||||
"eject": "react-scripts eject"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": [
|
||||
|
||||
+7
-11
@@ -3,23 +3,21 @@ version: "3"
|
||||
services:
|
||||
scouting-client:
|
||||
container_name: "scouting-client"
|
||||
restart: unless-stopped
|
||||
env_file:
|
||||
- .env
|
||||
build:
|
||||
context: ./client
|
||||
dockerfile: ./Dockerfile
|
||||
env_file:
|
||||
- .env
|
||||
expose:
|
||||
- 3000
|
||||
- 5000
|
||||
- 80
|
||||
ports:
|
||||
- "3000:3000"
|
||||
- "5000:5000"
|
||||
volumes:
|
||||
- ./client:/app
|
||||
|
||||
- "80:80/tcp"
|
||||
couchdb:
|
||||
container_name: "scouting-server"
|
||||
restart: unless-stopped
|
||||
env_file:
|
||||
- .env
|
||||
build:
|
||||
context: ./server
|
||||
dockerfile: ./Dockerfile
|
||||
@@ -27,8 +25,6 @@ services:
|
||||
- 5984
|
||||
ports:
|
||||
- "5984:5984"
|
||||
env_file:
|
||||
- .env
|
||||
environment:
|
||||
- COUCHDB_HOST=couchdb
|
||||
- COUCHDB_PORT=5984
|
||||
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user