Skip to content

Commit 4da54e9

Browse files
committed
Chore : 새 배포 환경 설정
1 parent 17c66d8 commit 4da54e9

File tree

4 files changed

+15
-32
lines changed

4 files changed

+15
-32
lines changed

src/server/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM eclipse-temurin:17-jdk-alpine
2+
#FROM arm64v8/openjdk:17
23
ARG JAR_FILE=./build/libs/*.jar
34
COPY ${JAR_FILE} /app.jar
45
ENTRYPOINT ["java","-jar","/app.jar"]

src/server/deploy.sh

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
#!/bin/sh
22

3-
port=`lsof -i :8080 -t`
3+
#port=`lsof -i :8080 -t`
44

5-
kill -9 $port
6-
git checkout dev
7-
git pull origin deploy
5+
#kill -9 $port
6+
git checkout server/deploy
7+
git pull origin server/deploy
88
cp src/main/resources/devapplication.yml src/main/resources/application.yml
9-
nohup ./gradlew bootRun > gradlew.log 2>&1 &
9+
./gradlew build -x test
10+
docker-compose up build -d
11+
#nohup ./gradlew bootRun > gradlew.log 2>&1 &

src/server/docker-compose.yml

+6-26
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,5 @@
11
version: '3'
22
services:
3-
database:
4-
container_name: mysql_db
5-
image: mysql
6-
restart: unless-stopped
7-
environment:
8-
MYSQL_DATABASE: drm
9-
MYSQL_ROOT_HOST: '%'
10-
MYSQL_ROOT_PASSWORD: root
11-
TZ: 'Asia/Seoul'
12-
ports:
13-
- "3306:3306"
14-
volumes:
15-
- ./mysql/conf.d:/etc/mysql/conf.d # MySQL 설정 파일 위치
16-
command:
17-
- "mysqld"
18-
- "--character-set-server=utf8mb4"
19-
- "--collation-server=utf8mb4_unicode_ci"
20-
networks:
21-
- test_network
223
redis-docker:
234
image: redis:latest
245
command: redis-server --port 6379
@@ -31,22 +12,21 @@ services:
3112
networks:
3213
- test_network
3314
application:
34-
container_name: docker-compose-test
15+
container_name: drm-server
3516
restart: on-failure
3617
build:
3718
context: .
3819
dockerfile: ./Dockerfile
3920
ports:
40-
- "8080:8080"
21+
- "8084:8084"
4122
environment:
42-
SPRING_DATASOURCE_URL: jdbc:mysql://mysql_db:3306/drm
43-
SPRING_DATASOURCE_USERNAME: "root"
44-
SPRING_DATASOURCE_PASSWORD: "root"
23+
SPRING_DATASOURCE_URL: jdbc:mysql://223.130.163.37:3306/drm
24+
SPRING_DATASOURCE_USERNAME: "keum2023"
25+
SPRING_DATASOURCE_PASSWORD: "keum2023!"
4526
depends_on:
46-
- database
4727
- redis-docker
4828
networks:
4929
- test_network
5030

5131
networks:
52-
test_network:
32+
test_network:

src/server/src/main/java/com/drm/server/config/RedisRepositoryConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class RedisRepositoryConfig {
1919

2020
@Bean
2121
public RedisConnectionFactory redisConnectionFactory() {
22-
return new LettuceConnectionFactory(redisProperties.getHost(), redisProperties.getPort());
22+
return new LettuceConnectionFactory("localhost",6379);
2323
}
2424

2525
@Bean

0 commit comments

Comments
 (0)