From e0c524c25d4963a43fd7e1de7142914d04a90571 Mon Sep 17 00:00:00 2001 From: Gyoungmin Kim Date: Mon, 4 Nov 2024 05:00:40 +0900 Subject: [PATCH 1/3] chore: remove custom-base-image related useless elements --- .github/workflows/jib-build.yaml | 1 - photo-service/Dockerfile | 11 ----------- photo-service/build.gradle.kts | 4 ---- 3 files changed, 16 deletions(-) delete mode 100644 photo-service/Dockerfile diff --git a/.github/workflows/jib-build.yaml b/.github/workflows/jib-build.yaml index e8eddb01..70e27041 100644 --- a/.github/workflows/jib-build.yaml +++ b/.github/workflows/jib-build.yaml @@ -58,7 +58,6 @@ jobs: IMAGE_NAME: ${{ inputs.image-name }} IMAGE_TAG: ${{ inputs.image-tag }} SERVER_PORT: ${{ inputs.server-port }} - RECAP_SRC_URL: ${{ secrets.RECAP_SRC_URL }} run: | cd ${{ inputs.module-path }} && \ chmod +x gradlew && ./gradlew jib diff --git a/photo-service/Dockerfile b/photo-service/Dockerfile deleted file mode 100644 index 76d4e5e5..00000000 --- a/photo-service/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM amazoncorretto:17-alpine3.17-jdk - -ARG RECAP_SRC_URL -RUN apt-get update && \ - apt-get install -y ffmpeg && \ - apt-get clean - -RUN mkdir -p /usr/bin/recap/tmp && \ - wget -O /tmp/src.tar.gz $RECAP_SRC_URL && \ - tar -xvzf /tmp/src.tar.gz -C /usr/bin/recap && \ - rm /tmp/src.tar.gz diff --git a/photo-service/build.gradle.kts b/photo-service/build.gradle.kts index 30722bc8..7e728236 100644 --- a/photo-service/build.gradle.kts +++ b/photo-service/build.gradle.kts @@ -52,7 +52,6 @@ jib { val imageName: String? = System.getenv("IMAGE_NAME") val imageTag: String? = System.getenv("IMAGE_TAG") val serverPort: String = System.getenv("SERVER_PORT") ?: "8080" - val recapSrcUrl: String? = System.getenv("RECAP_SRC_URL") from { image = "custom-base-image" } @@ -61,9 +60,6 @@ jib { tags = setOf(imageTag, "latest") } container { - environment = mapOf( - "RECAP_SRC_URL" to recapSrcUrl - ) jvmFlags = listOf( "-Dspring.profiles.active=$activeProfile", From 26334b8a6d59a3b8bb943dace797a46488ac258d Mon Sep 17 00:00:00 2001 From: Gyoungmin Kim Date: Mon, 4 Nov 2024 09:15:56 +0900 Subject: [PATCH 2/3] fix: specify docker image repo name --- photo-service/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/photo-service/build.gradle.kts b/photo-service/build.gradle.kts index 7e728236..6c526e78 100644 --- a/photo-service/build.gradle.kts +++ b/photo-service/build.gradle.kts @@ -53,7 +53,7 @@ jib { val imageTag: String? = System.getenv("IMAGE_TAG") val serverPort: String = System.getenv("SERVER_PORT") ?: "8080" from { - image = "custom-base-image" + image = "spinachpasta/custom-base-image:latest" } to { image = imageName From 8d17980b8a6ca83f1a6adf2177563c369efc6182 Mon Sep 17 00:00:00 2001 From: Gyoungmin Kim Date: Mon, 4 Nov 2024 09:25:35 +0900 Subject: [PATCH 3/3] fix: change docker base image name --- photo-service/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/photo-service/build.gradle.kts b/photo-service/build.gradle.kts index 6c526e78..cda793ee 100644 --- a/photo-service/build.gradle.kts +++ b/photo-service/build.gradle.kts @@ -53,7 +53,7 @@ jib { val imageTag: String? = System.getenv("IMAGE_TAG") val serverPort: String = System.getenv("SERVER_PORT") ?: "8080" from { - image = "spinachpasta/custom-base-image:latest" + image = "spinachpasta/photo-service-base:latest" } to { image = imageName