Skip to content

Commit

Permalink
Merge pull request #15 from 42Seoul-LastDance/main
Browse files Browse the repository at this point in the history
받아라 몬스터볼!
  • Loading branch information
SikPang authored Sep 18, 2023
2 parents a1dbe40 + fa170d3 commit b078193
Show file tree
Hide file tree
Showing 43 changed files with 7,315 additions and 4,720 deletions.
4 changes: 0 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

<br><br>

## 작업 내용

<br><br>

## 참고 사항

<br><br>
Expand Down
138 changes: 70 additions & 68 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,76 +1,78 @@
version: "3"
version: '3'

services:
next:
container_name: next
build: ./services/next
image: next:ts
volumes:
- next:/usr/app/srcs
networks:
- my_network
env_file:
- ./.env
ports:
- "4242:3000"
restart: always
depends_on:
- postgresql
next:
container_name: next
build: ./services/next
image: next:ts
volumes:
- next:/usr/app/srcs
networks:
- my_network
# env_file:
# - ./.env
ports:
- '4242:4242'
restart: always
# depends_on:
# - nest
# - postgresql

nest:
container_name: nest
build: ./services/nest
image: nest:ts
volumes:
- nest:/usr/app/srcs
networks:
- my_network
env_file:
- ./.env
ports:
- "3000:3000"
restart: always

postgresql:
container_name: postgresql
build:
context: ./services/postgresql
args:
- DB_NAME=${DB_NAME}
- POSTGRES_USER_ID=${POSTGRES_USER_ID}
- POSTGRES_USER_PASSWORD=${POSTGRES_USER_PASSWORD}
image: db:ts
expose:
- "5432"
volumes:
- db:/var/lib/postgresql/data
environment:
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
networks:
- my_network
restart: always
# nest:
# container_name: nest
# build: ./services/nest
# image: nest:ts
# volumes:
# - nest:/usr/app/srcs
# networks:
# - my_network
# env_file:
# - ./.env
# ports:
# - '3000:3000'
# restart: always
# depends_on:
# - postgresql

# postgresql:
# container_name: postgresql
# build:
# context: ./services/postgresql
# args:
# - DB_NAME=${DB_NAME}
# - POSTGRES_USER_ID=${POSTGRES_USER_ID}
# - POSTGRES_USER_PASSWORD=${POSTGRES_USER_PASSWORD}
# image: db:ts
# expose:
# - '5432'
# volumes:
# - db:/var/lib/postgresql/data
# environment:
# - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
# networks:
# - my_network
# restart: always

volumes:
next:
driver: local
driver_opts:
type: none
o: bind
device: '${PWD}/srcs/next'
nest:
driver: local
driver_opts:
type: none
o: bind
device: '${PWD}/srcs/nest'
db:
driver: local
driver_opts:
type: none
o: bind
device: '${PWD}/srcs/postgresql'
next:
driver: local
driver_opts:
type: none
o: bind
device: '${PWD}/srcs/next'
# nest:
# driver: local
# driver_opts:
# type: none
# o: bind
# device: '${PWD}/srcs/nest'
# db:
# driver: local
# driver_opts:
# type: none
# o: bind
# device: '${PWD}/srcs/postgresql'

networks:
my_network:
driver: bridge
my_network:
driver: bridge
5 changes: 3 additions & 2 deletions services/nest/init_nest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
npm install --prefix srcs
npm run --prefix srcs start:dev
npm install --prefix srcs --save @nestjs/cli

npm run --prefix srcs start:dev --cache-clear
19 changes: 10 additions & 9 deletions services/next/init.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
echo "----- Start installing npm dependencies -----"

npm install --prefix srcs next
npm install --prefix srcs --save redux
npm install --prefix srcs --save react-redux
npm install --prefix srcs --save @reduxjs/toolkit
# npm install --prefix srcs --save react-unity-webgl
# npm install --prefix srcs --save nextjs-unity-webgl
# npm install --prefix srcs --save axios
# npm install --prefix srcs --save axios-auth-refresh
# npm install --prefix srcs --save react-router-dom
npm install --prefix srcs --save @headlessui/react
# npm install --prefix srcs --save redux react-redux @reduxjs/toolkit react-devtools
# npm install --prefix srcs --save react-router-dom react-cookie jsonwebtoken
# npm install --prefix srcs --save react-unity-webgl nextjs-unity-webgl
# npm install --prefix srcs --save axios axios-auth-refresh
# npm install --prefix srcs --save @typescript-eslint
# npm install --prefix srcs --save turbo

npm update --prefix srcs next @headlessui/react redux react-redux @reduxjs/toolkit react-devtools react-router-dom react-cookie jsonwebtoken react-unity-webgl nextjs-unity-webgl axios axios-auth-refresh @typescript-eslint turbo
echo "----- Successfully installed -----"

npm --prefix srcs run dev
npm --prefix srcs run dev --cache-clear
Loading

0 comments on commit b078193

Please sign in to comment.