Skip to content

Commit e68d4cc

Browse files
junghyeonsujunghyeonsu
authored
dockerfile명 수정 (#83)
* chore: 안쓰이는 dockerfile 및 docker-compose 삭제 * chore: dockerfile-kontrol 변경 * chore: DOCKERFILE -> Dockerfile로 변경 * Delete DOCKERFILE.kontrol * Create Dockerfile.kontrol * Update Dockerfile.kontrol * chore: dockerfile 정리 * chore: docker-compose 개행 추가 * Update pushCode.ts
1 parent 11a0c4c commit e68d4cc

File tree

6 files changed

+88
-102
lines changed

6 files changed

+88
-102
lines changed

‎.deploy/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ type: v1/appservice
22

33
images:
44
server:
5-
dockerfile: DOCKERFILE.kontrol
5+
dockerfile: Dockerfile.kontrol
66

77
configs:
88
env:

‎DOCKERFILE

-20
This file was deleted.

‎Dockerfile.compose

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
FROM node:16
2+
3+
WORKDIR /app
4+
5+
COPY . .
6+
7+
RUN yarn
8+
RUN yarn build
9+
10+
CMD ["yarn", "dev"]

‎DOCKERFILE.kontrol ‎Dockerfile.kontrol

+32-37
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,32 @@
1-
FROM node:16
2-
3-
ENV CI=true
4-
ENV NODE_ENV=development
5-
ENV VITE_BASE_SERVER_URL_DEV=VITE_BASE_SERVER_URL_DEV
6-
ENV VITE_BASE_SERVER_URL_PROD=VITE_BASE_SERVER_URL_PROD
7-
ENV VITE_AUTH0_DOMAIN=VITE_AUTH0_DOMAIN
8-
ENV VITE_AUTH0_CLIENT_ID=VITE_AUTH0_CLIENT_ID
9-
ENV VITE_EMAIL_DOMAIN_NAME=VITE_EMAIL_DOMAIN_NAME
10-
ENV BASE_SERVER_URL_DEV=BASE_SERVER_URL_DEV
11-
ENV BASE_SERVER_URL_PROD=BASE_SERVER_URL_PROD
12-
ENV SLACK_BOT_TOKEN_DEV=SLACK_BOT_TOKEN_DEV
13-
ENV SLACK_BOT_TOKEN_PROD=SLACK_BOT_TOKEN_PROD
14-
ENV CODEPOCKET_CHANNEL_ID_DEV=CODEPOCKET_CHANNEL_ID_DEV
15-
ENV CODEPOCKET_CHANNEL_ID_PROD=CODEPOCKET_CHANNEL_ID_PROD
16-
ENV CHAPTER_FRONTED_CHANNEL_ID_DEV=CHAPTER_FRONTED_CHANNEL_ID_DEV
17-
ENV CHAPTER_FRONTED_CHANNEL_ID_PROD=CHAPTER_FRONTED_CHANNEL_ID_PROD
18-
ENV MONGO_DB_URI_DEV=MONGO_DB_URI_DEV
19-
ENV MONGO_DB_URI_PROD=MONGO_DB_URI_PROD
20-
ENV MONGO_DB_NAME_DEV=MONGO_DB_NAME_DEV
21-
ENV MONGO_DB_NAME_PROD=MONGO_DB_NAME_PROD
22-
23-
RUN apt-get -qq update
24-
RUN apt-get -qq upgrade --yes
25-
RUN apt-get -qq install curl --yes
26-
RUN apt-get -qq install git --yes
27-
28-
WORKDIR /app
29-
30-
COPY . .
31-
32-
RUN yarn install --immutable --silent
33-
RUN yarn build
34-
35-
EXPOSE 8080
36-
37-
CMD ["yarn", "workspace", "@pocket/server", "dev"]
1+
FROM node:16
2+
3+
ENV CI=true
4+
ENV NODE_ENV=production
5+
ENV VITE_BASE_SERVER_URL_DEV=VITE_BASE_SERVER_URL_DEV
6+
ENV VITE_BASE_SERVER_URL_PROD=VITE_BASE_SERVER_URL_PROD
7+
ENV VITE_AUTH0_DOMAIN=VITE_AUTH0_DOMAIN
8+
ENV VITE_AUTH0_CLIENT_ID=VITE_AUTH0_CLIENT_ID
9+
ENV VITE_EMAIL_DOMAIN_NAME=VITE_EMAIL_DOMAIN_NAME
10+
ENV BASE_SERVER_URL_DEV=BASE_SERVER_URL_DEV
11+
ENV BASE_SERVER_URL_PROD=BASE_SERVER_URL_PROD
12+
ENV SLACK_BOT_TOKEN_DEV=SLACK_BOT_TOKEN_DEV
13+
ENV SLACK_BOT_TOKEN_PROD=SLACK_BOT_TOKEN_PROD
14+
ENV CODEPOCKET_CHANNEL_ID_DEV=CODEPOCKET_CHANNEL_ID_DEV
15+
ENV CODEPOCKET_CHANNEL_ID_PROD=CODEPOCKET_CHANNEL_ID_PROD
16+
ENV CHAPTER_FRONTED_CHANNEL_ID_DEV=CHAPTER_FRONTED_CHANNEL_ID_DEV
17+
ENV CHAPTER_FRONTED_CHANNEL_ID_PROD=CHAPTER_FRONTED_CHANNEL_ID_PROD
18+
ENV MONGO_DB_URI_DEV=MONGO_DB_URI_DEV
19+
ENV MONGO_DB_URI_PROD=MONGO_DB_URI_PROD
20+
ENV MONGO_DB_NAME_DEV=MONGO_DB_NAME_DEV
21+
ENV MONGO_DB_NAME_PROD=MONGO_DB_NAME_PROD
22+
23+
WORKDIR /app
24+
25+
COPY . .
26+
27+
RUN yarn install --immutable --silent
28+
RUN yarn build
29+
30+
EXPOSE 8080
31+
32+
CMD ["yarn", "workspace", "@codepocket/server", "dev"]

‎core/server/src/pushCode.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { pushCodeRequestValidate, PushCodeResponse } from '@pocket/schema';
1+
import { pushCodeRequestValidate, PushCodeResponse } from '@codepocket/schema';
22
import { CodeInfo, CodeName, PocketToken, PushCodeParams } from 'types';
3+
34
import { postMessageToSlack, SlackConfig, uploadCodeToSlack } from './slack';
45

56
interface PushCodeType<Response> {

‎docker-compose.yml

+43-43
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
version: '3.8'
2-
3-
services:
4-
mongo:
5-
image: mongo
6-
restart: always
7-
ports:
8-
- '27017:27017'
9-
command: mongod --port 27017
10-
environment:
11-
MONGO_INITDB_ROOT_USERNAME: root
12-
MONGO_INITDB_ROOT_PASSWORD: example
13-
expose:
14-
- '27017'
15-
16-
app:
17-
build:
18-
dockerfile: DOCKERFILE
19-
context: ./
20-
depends_on:
21-
- mongo
22-
ports:
23-
- '3000:3000'
24-
- '8080:8080'
25-
environment:
26-
NODE_ENV: development
27-
VITE_BASE_SERVER_URL_DEV: ${VITE_BASE_SERVER_URL_DEV}
28-
VITE_BASE_SERVER_URL_PROD: ${VITE_BASE_SERVER_URL_PROD}
29-
VITE_AUTH0_DOMAIN: ${VITE_AUTH0_DOMAIN}
30-
VITE_AUTH0_CLIENT_ID: ${VITE_AUTH0_CLIENT_ID}
31-
VITE_EMAIL_DOMAIN_NAME: ${VITE_EMAIL_DOMAIN_NAME}
32-
BASE_SERVER_URL_DEV: ${BASE_SERVER_URL_DEV}
33-
BASE_SERVER_URL_PROD: ${BASE_SERVER_URL_PROD}
34-
SLACK_BOT_TOKEN_DEV: ${SLACK_BOT_TOKEN_DEV}
35-
SLACK_BOT_TOKEN_PROD: ${SLACK_BOT_TOKEN_PROD}
36-
CODEPOCKET_CHANNEL_ID_DEV: ${CODEPOCKET_CHANNEL_ID_DEV}
37-
CODEPOCKET_CHANNEL_ID_PROD: ${CODEPOCKET_CHANNEL_ID_PROD}
38-
CHAPTER_FRONTED_CHANNEL_ID_DEV: ${CHAPTER_FRONTED_CHANNEL_ID_DEV}
39-
CHAPTER_FRONTED_CHANNEL_ID_PROD: ${CHAPTER_FRONTED_CHANNEL_ID_PROD}
40-
MONGO_DB_URI_DEV: ${MONGO_DB_URI_DEV}
41-
MONGO_DB_URI_PROD: ${MONGO_DB_URI_PROD}
42-
MONGO_DB_NAME_DEV: ${MONGO_DB_NAME_DEV}
43-
MONGO_DB_NAME_PROD: ${MONGO_DB_NAME_PROD}
1+
version: '3.8'
2+
3+
services:
4+
mongo:
5+
image: mongo
6+
restart: always
7+
ports:
8+
- '27017:27017'
9+
command: mongod --port 27017
10+
environment:
11+
MONGO_INITDB_ROOT_USERNAME: root
12+
MONGO_INITDB_ROOT_PASSWORD: example
13+
expose:
14+
- '27017'
15+
16+
app:
17+
build:
18+
dockerfile: Dockerfile.compose
19+
context: ./
20+
depends_on:
21+
- mongo
22+
ports:
23+
- '3000:3000'
24+
- '8080:8080'
25+
environment:
26+
NODE_ENV: development
27+
VITE_BASE_SERVER_URL_DEV: ${VITE_BASE_SERVER_URL_DEV}
28+
VITE_BASE_SERVER_URL_PROD: ${VITE_BASE_SERVER_URL_PROD}
29+
VITE_AUTH0_DOMAIN: ${VITE_AUTH0_DOMAIN}
30+
VITE_AUTH0_CLIENT_ID: ${VITE_AUTH0_CLIENT_ID}
31+
VITE_EMAIL_DOMAIN_NAME: ${VITE_EMAIL_DOMAIN_NAME}
32+
BASE_SERVER_URL_DEV: ${BASE_SERVER_URL_DEV}
33+
BASE_SERVER_URL_PROD: ${BASE_SERVER_URL_PROD}
34+
SLACK_BOT_TOKEN_DEV: ${SLACK_BOT_TOKEN_DEV}
35+
SLACK_BOT_TOKEN_PROD: ${SLACK_BOT_TOKEN_PROD}
36+
CODEPOCKET_CHANNEL_ID_DEV: ${CODEPOCKET_CHANNEL_ID_DEV}
37+
CODEPOCKET_CHANNEL_ID_PROD: ${CODEPOCKET_CHANNEL_ID_PROD}
38+
CHAPTER_FRONTED_CHANNEL_ID_DEV: ${CHAPTER_FRONTED_CHANNEL_ID_DEV}
39+
CHAPTER_FRONTED_CHANNEL_ID_PROD: ${CHAPTER_FRONTED_CHANNEL_ID_PROD}
40+
MONGO_DB_URI_DEV: ${MONGO_DB_URI_DEV}
41+
MONGO_DB_URI_PROD: ${MONGO_DB_URI_PROD}
42+
MONGO_DB_NAME_DEV: ${MONGO_DB_NAME_DEV}
43+
MONGO_DB_NAME_PROD: ${MONGO_DB_NAME_PROD}

0 commit comments

Comments
 (0)