강동현 / nodejs-game

Go to a project
Toggle navigation Toggle navigation pinning
강동현
69834b7c 1 parent c0693d20
Builds for 1 pipeline failed in 1 minute 12 seconds

도커파일, gitlab-ci 수정

Inline Side-by-side
Showing 2 changed files with 9 additions and 22 deletions
...@@ -13,20 +13,7 @@ Test Server: ...@@ -13,20 +13,7 @@ Test Server:
13 - yarn install 13 - yarn install
14 - yarn test 14 - yarn test
15 15
16 -Build Server: 16 +Build:
17 stage: build 17 stage: build
18 script: 18 script:
19 - - cd common 19 + - HOST=2020105578.oss2021.tk SSL_CERT=/etc/letsencrypt/live/2020105578.oss2021.tk/cert.pem SSL_KEY=/etc/letsencrypt/live/2020105578.oss2021.tk/privkey.pem SSL_CA=/etc/letsencrypt/live/2020105578.oss2021.tk/fullchain.pem docker-compose build --no-cache
20 - - yarn install
21 - - cd ../server
22 - - yarn install
23 - - yarn build
24 -
25 -Build Web:
26 - stage: build
27 - script:
28 - - cd common
29 - - yarn install
30 - - cd ../web
31 - - npm install
32 - - npm build
......
...@@ -11,19 +11,19 @@ services: ...@@ -11,19 +11,19 @@ services:
11 volumes: 11 volumes:
12 - /etc/letsencrypt:/etc/letsencrypt 12 - /etc/letsencrypt:/etc/letsencrypt
13 environment: 13 environment:
14 - - SSL_CERT={SSL_CERT} 14 + - SSL_CERT=${SSL_CERT}
15 - - SSL_KEY={SSL_KEY} 15 + - SSL_KEY=${SSL_KEY}
16 - - SSL_CA={SSL_CA} 16 + - SSL_CA=${SSL_CA}
17 17
18 web: 18 web:
19 build: 19 build:
20 context: . 20 context: .
21 dockerfile: ./web/Dockerfile 21 dockerfile: ./web/Dockerfile
22 args: 22 args:
23 - - HOST={HOST} 23 + - HOST=${HOST}
24 - - SSL_CERT={SSL_CERT} 24 + - SSL_CERT=${SSL_CERT}
25 - - SSL_KEY={SSL_KEY} 25 + - SSL_KEY=${SSL_KEY}
26 - - SSL_CA={SSL_CA} 26 + - SSL_CA=${SSL_CA}
27 restart: unless-stopped 27 restart: unless-stopped
28 ports: 28 ports:
29 - "443:443" 29 - "443:443"
......