diff --git a/tasks/docker-registry/task.yaml b/tasks/docker-registry/task.yaml index 1a969c0..aa9a764 100644 --- a/tasks/docker-registry/task.yaml +++ b/tasks/docker-registry/task.yaml @@ -65,10 +65,12 @@ spec: } EOF - # PyPI 인증 정보 환경 변수 파일 생성 + # PyPI 인증 정보 변수 정의 echo "🔐 Setting PyPI auth env..." - echo "PYPI_USERNAME=$(cat /workspace/pypi-auth/username)" > /tekton/home/pypi-auth.env - echo "PYPI_PASSWORD=$(cat /workspace/pypi-auth/password)" >> /tekton/home/pypi-auth.env + PYPI_USERNAME=$(cat /workspace/pypi-auth/username) + PYPI_PASSWORD=$(cat /workspace/pypi-auth/password) + echo "export PYPI_USERNAME=$PYPI_USERNAME" > /tekton/home/pypi-auth.env + echo "export PYPI_PASSWORD=$PYPI_PASSWORD" >> /tekton/home/pypi-auth.env # 🏗️ Kaniko 공식 이미지 실행 - name: kaniko-build @@ -77,20 +79,24 @@ spec: env: - name: DOCKER_CONFIG value: /tekton/home/.docker - script: | - #!/bin/sh - set -e - - # PyPI 인증 정보 로드 - source /tekton/home/pypi-auth.env - - # Kaniko 빌드 실행 - /kaniko/executor \ - --dockerfile=$(params.subdirectory)/$(params.dockerfile) \ - --context=$(params.subdirectory)/$(params.context) \ - --destination=$(params.imageName):$(params.tag) \ - --skip-tls-verify \ - --reproducible \ - --verbosity=info \ - --build-arg=PYPI_USERNAME=$PYPI_USERNAME \ - --build-arg=PYPI_PASSWORD=$PYPI_PASSWORD \ No newline at end of file + - name: PYPI_USERNAME + valueFrom: + configMapKeyRef: + name: pypi-auth-config + key: username + optional: true + - name: PYPI_PASSWORD + valueFrom: + configMapKeyRef: + name: pypi-auth-config + key: password + optional: true + args: + - --dockerfile=$(params.subdirectory)/$(params.dockerfile) + - --context=$(params.subdirectory)/$(params.context) + - --destination=$(params.imageName):$(params.tag) + - --skip-tls-verify + - --reproducible + - --verbosity=debug + - --build-arg=PYPI_USERNAME=$(env PYPI_USERNAME) + - --build-arg=PYPI_PASSWORD=$(env PYPI_PASSWORD) \ No newline at end of file