diff --git a/deployment/cicd/Jenkinsfile b/deployment/cicd/Jenkinsfile index fd84718..804b46a 100644 --- a/deployment/cicd/Jenkinsfile +++ b/deployment/cicd/Jenkinsfile @@ -123,12 +123,23 @@ podTemplate( stage('Build & Push Images') { timeout(time: 30, unit: 'MINUTES') { container('podman') { - withCredentials([usernamePassword( - credentialsId: 'acr-credentials', - usernameVariable: 'USERNAME', - passwordVariable: 'PASSWORD' - )]) { - sh "podman login acrdigitalgarage01.azurecr.io --username \$USERNAME --password \$PASSWORD" + withCredentials([ + usernamePassword( + credentialsId: 'acr-credentials', + usernameVariable: 'ACR_USERNAME', + passwordVariable: 'ACR_PASSWORD' + ), + usernamePassword( + credentialsId: 'dockerhub-credentials', + usernameVariable: 'DOCKERHUB_USERNAME', + passwordVariable: 'DOCKERHUB_PASSWORD' + ) + ]) { + // Docker Hub 로그인 (rate limit 해결) + sh "podman login docker.io --username \$DOCKERHUB_USERNAME --password \$DOCKERHUB_PASSWORD" + + // ACR 로그인 + sh "podman login acrdigitalgarage01.azurecr.io --username \$ACR_USERNAME --password \$ACR_PASSWORD" services.each { service -> sh """ diff --git a/deployment/cicd/jenkins-pipeline-guide.md b/deployment/cicd/jenkins-pipeline-guide.md index d4adcf6..909ca41 100644 --- a/deployment/cicd/jenkins-pipeline-guide.md +++ b/deployment/cicd/jenkins-pipeline-guide.md @@ -43,7 +43,15 @@ Manage Jenkins > Credentials > Add Credentials - Password: {ACR_PASSWORD} ``` -#### 3. SonarQube Token +#### 3. Docker Hub Credentials (Rate Limit 해결용) +``` +- Kind: Username with password +- ID: dockerhub-credentials +- Username: {DOCKERHUB_USERNAME} +- Password: {DOCKERHUB_PASSWORD} +``` + +#### 4. SonarQube Token ``` - Kind: Secret text - ID: sonarqube-token diff --git a/deployment/container/Dockerfile-backend b/deployment/container/Dockerfile-backend index 3fc31a3..66d7f45 100644 --- a/deployment/container/Dockerfile-backend +++ b/deployment/container/Dockerfile-backend @@ -1,11 +1,11 @@ # Build stage -FROM openjdk:23-oraclelinux8 AS builder +FROM eclipse-temurin:21-jdk AS builder ARG BUILD_LIB_DIR ARG ARTIFACTORY_FILE COPY ${BUILD_LIB_DIR}/${ARTIFACTORY_FILE} app.jar # Run stage -FROM openjdk:23-slim +FROM eclipse-temurin:21-jre ENV USERNAME=k8s ENV ARTIFACTORY_HOME=/home/${USERNAME} ENV JAVA_OPTS=""