Merge pull request #170 from moit03/dev

Dev

.ebextensions/01_install_redis_cli.config

@@ -0,0 +1,4 @@
+commands:
+  01_install_redis_cli:
+    command: "sudo yum install -y redis"
+    ignoreErrors: "false"

.github/workflows/docker.yml

@@ -32,14 +32,14 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x ./gradlew
 
-      - name: make env.properties
-        if: |
-          contains(github.ref, 'main') ||
-          contains(github.ref, 'dev')
-        run: |
-          touch env.properties
-          echo "${{ secrets.ENV_PROPERTIES }}" > env.properties
-        shell: bash
+#      - name: make env.properties
+#        if: |
+#          contains(github.ref, 'main') ||
+#          contains(github.ref, 'dev')
+#        run: |
+#          touch env.properties
+#          echo "${{ secrets.ENV_PROPERTIES }}" > env.properties
+#        shell: bash
 
       - name: make application-dev
         if: |
@@ -55,14 +55,6 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew build -x test
 
-      # 현재시간가져오기
-      - name: Get current time
-        uses: josStorer/get-current-time@v2.0.2
-        id: current-time
-        with:
-          format: YYYY-MM-DDTHH-mm-ss
-          utcOffset: "+09:00"
-
       # docker build & push
       # Dockerfile을 통해 이미지화
       # push to docker hub

.github/workflows/feat.yml

@@ -33,11 +33,11 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x ./gradlew
 
-      - name: make env.properties
-        run: |
-          touch env.properties
-          echo "${{ secrets.ENV_PROPERTIES }}" > env.properties
-        shell: bash
+#      - name: make env.properties
+#        run: |
+#          touch env.properties
+#          echo "${{ secrets.ENV_PROPERTIES }}" > env.properties
+#        shell: bash
 
       - name: Build with Gradle
         run: ./gradlew build -x test

.gitignore

@@ -204,6 +204,12 @@ gradle-app.setting
 .idea/
 env.properties
 prometheus.yml
+application-dev.properties
+application-local.properties
+application-sql.properties
+
+### Logging files ###
+/log
 
 # End of https://www.toptal.com/developers/gitignore/api/windows,macos,intellij,gradle
 /.idea/.name

Dockerfile

@@ -1,6 +1,6 @@
 FROM openjdk:17-alpine
 
-COPY env.properties /env.properties
+#COPY env.properties /env.properties
 COPY src/main/resources/application-dev.properties /src/main/resources/application-dev.properties
 
 ARG JAR_FILE=build/libs/*.jar

build.gradle

@@ -46,6 +46,11 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator' // actuator
     implementation 'io.micrometer:micrometer-registry-prometheus'
 
+    // postgresql, postgis 관련 util
+    implementation 'io.hypersistence:hypersistence-utils-hibernate-63:3.7.4'
+    implementation 'org.hibernate:hibernate-spatial:6.4.4.Final'
+    implementation group: 'org.hibernate.orm', name: 'hibernate-spatial', version: '6.4.4.Final'
+
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
@@ -75,5 +80,4 @@ tasks.named('test') {
 
 jar {
     enabled = false
-}
-
+}