Fix 3

hyperskill · Oct 19, 2023 · 65aab34 · 65aab34
1 parent 4992df1
commit 65aab34
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -99,7 +99,8 @@ jobs:
         run: |
           echo "SLACK_APP_TOKEN=$(echo "${{ secrets.SLACK_APP_TOKEN }}" | base64)" >> $GITHUB_ENV
           echo "SLACK_BOT_TOKEN=$(echo "${{ secrets.SLACK_BOT_TOKEN }}" | base64)" >> $GITHUB_ENV
-          echo "dockerConfigJson=$(echo "{\"auths\": {\"https://hyperskill.azurecr.io/hyperskill/\": {\"auth\": \"$(echo ${{ secrets.AZ_REGISTRY_USERNAME }}:${{ secrets.AZ_REGISTRY_PASSWORD}} | base64)\"}}}" | base64)" >> $GITHUB_ENV
+          echo "dockerAuth=$(echo "${{ secrets.AZ_REGISTRY_USERNAME }}:${{ secrets.AZ_REGISTRY_PASSWORD}}" | base64)" >> $GITHUB_ENV
+          echo "dockerConfigJson=$(echo "{\"auths\": {\"hyperskill.azurecr.io\": {\"auth\": \"${{ env.dockerAuth }}\"}}}" | base64)" >> $GITHUB_ENV
           helm upgrade data-slack-bot ./deploy/slack_bot \
           --namespace data-slack-bot \
           --install \

diff --git a/deploy/slack_bot/templates/docker_secret.yaml b/deploy/slack_bot/templates/docker_secret.yaml
@@ -13,4 +13,4 @@ metadata:
     "helm.sh/hook-weight": "0"
 type: kubernetes.io/dockerconfigjson
 data:
-  .dockerconfigjson: {{ .Values.image.dockerConfigJson | b64enc }}
+  .dockerconfigjson: {{ .Values.image.dockerConfigJson }}