diff --git a/server/collusic-be/docker-compose.yml b/server/collusic-be/docker-compose.yml index 8903b4be..224b5fe2 100644 --- a/server/collusic-be/docker-compose.yml +++ b/server/collusic-be/docker-compose.yml @@ -9,7 +9,6 @@ services: app: restart: always - image: kjkun7631/collusic-api build: context: . dockerfile: Dockerfile-dev @@ -21,22 +20,4 @@ services: JASYPT_PASSWORD: ${JASYPT_PASSWORD} depends_on: - redis - - mysql - command: gradle clean verify spring-boot:run -Dspring-boot.run.profiles=dev - - mysql: - restart: always - image: mysql:8.0 - container_name: mysql - ports: - - "3306:3306" - environment: - MYSQL_ROOT_PASSWORD: root - MYSQL_DATABASE: collusic-new - MYSQL_USER: collusic-new - MYSQL_PASSWORD: collusic-db-secret - volumes: - - mysql-data:/var/lib/mysql - -volumes: - mysql-data: \ No newline at end of file + command: gradle clean verify spring-boot:run -Dspring-boot.run.profiles=dev \ No newline at end of file diff --git a/server/collusic-be/src/main/resources/application-prod_db.yml b/server/collusic-be/src/main/resources/application-prod_db.yml index aae3d599..6a473cd1 100644 --- a/server/collusic-be/src/main/resources/application-prod_db.yml +++ b/server/collusic-be/src/main/resources/application-prod_db.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: ENC(gnyYY2my5ZaFbvuc1ShsFN8N/6HyTS1sQ5UD+qe72zTg/xZCwIDJsttUCG56/ZZfmIRoFEy6c0gJgFE1FhmB9lYNO9nGF2bf8F75TJqccuicBum0mkyqp30RmK7tC4VoKmHw97c6MRAyx3Iv7LagNw==) + url: ENC(0UN3QoywTt1aetAUuH2wBmNQ81GfewuEflb08Q7KfEv+AZ82o3C65RruLLWFtOemgsLQ/+xmqmv/O45y/NrUTDv/hOYG+9lC6/4w/TQ6H778gFuUKVxYyh9/k6egITMTRkfcW/VDeJJfWh+KVMBSyAlmrFZRo7nFnsZCjuXRG9W1d2SkNqJJ9Ik044jnVPv2) username: ENC(mf26xrSdlsDGLOp2uRVtYQ==) password: ENC(B9/bakG1kuaw3NeCNI4dq6K/zkFiyO7uSWx6IR7jUQA=) @@ -14,5 +14,5 @@ spring: jdbc: batch_size: 10 hibernate: - ddl-auto: create - generate-ddl: true \ No newline at end of file + ddl-auto: validate + generate-ddl: false \ No newline at end of file diff --git a/server/collusic-be/src/test/java/com/collusic/collusicbe/config/JasyptTest.java b/server/collusic-be/src/test/java/com/collusic/collusicbe/config/JasyptTest.java index 50963d23..b9ee83bc 100644 --- a/server/collusic-be/src/test/java/com/collusic/collusicbe/config/JasyptTest.java +++ b/server/collusic-be/src/test/java/com/collusic/collusicbe/config/JasyptTest.java @@ -39,7 +39,6 @@ public void setUp() { public void decryptTest() { String decryptedText = jasyptStringEncryptor.decrypt(defaultEncryptedText); - assertThat(decryptedText).isEqualTo(defaultRawText); }