From 85211b9b3bee05983a966378fc62e2d5f1134bc7 Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@3a-systems.ru>
Date: Tue, 19 Apr 2022 18:39:04 +0000
Subject: [PATCH] FIX release.yml errors

---
 .github/workflows/release.yml |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1bfd3dc..704ab83 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -89,11 +89,14 @@
             opendj-dsml-servlet/target/*.war
             opendj-rest2ldap-servlet/target/*.war
       - name: Docker publish hub.docker.com
-        if: ${{ secrets.DOCKER_PASSWORD!='' && secrets.DOCKER_USERNAME!=''}}
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        if: ${{ env.DOCKER_PASSWORD!='' && env.DOCKER_USERNAME!=''}}
         continue-on-error: true
         shell: bash
         run:   |
-          echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+          echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
           docker build opendj-packages/opendj-docker -f opendj-packages/opendj-docker/Dockerfile -t ${GITHUB_REPOSITORY,,} -t ${GITHUB_REPOSITORY,,}:${{ github.event.inputs.releaseVersion }} --build-arg VERSION=${{ github.event.inputs.releaseVersion }}
           docker push ${GITHUB_REPOSITORY,,}
           docker push ${GITHUB_REPOSITORY,,}:${{ github.event.inputs.releaseVersion }}
@@ -105,8 +108,10 @@
         shell: bash
         env:
           GITHUB_REPOSITORY_NAME: ${{ github.event.repository.name }}
+          GITHUB_ACTOR: ${{ github.actor }}
+          GITHUB_TOKEN: ${{ github.token }}
         run:   |
-          echo "${{ secrets.GITHUB_TOKEN }}" | docker login -u "Open Identity Platform Community" docker.pkg.github.com --password-stdin
+          echo "$GITHUB_TOKEN" | docker login -u "Open Identity Platform Community" docker.pkg.github.com --password-stdin
           docker build opendj-packages/opendj-docker -f opendj-packages/opendj-docker/Dockerfile -t docker.pkg.github.com/${GITHUB_REPOSITORY,,}/${GITHUB_REPOSITORY_NAME,,} -t docker.pkg.github.com/${GITHUB_REPOSITORY,,}:${{ github.event.inputs.releaseVersion }}/${GITHUB_REPOSITORY_NAME,,} --build-arg VERSION=${{ github.event.inputs.releaseVersion }}
           docker push docker.pkg.github.com/${GITHUB_REPOSITORY,,}/${GITHUB_REPOSITORY_NAME,,}
           docker push docker.pkg.github.com/${GITHUB_REPOSITORY,,}/${GITHUB_REPOSITORY_NAME,,}:${{ github.event.inputs.releaseVersion }}
@@ -132,4 +137,4 @@
            git commit -a -m "upload docs after release ${{ github.event.inputs.releaseVersion }}"
            git push --quiet --force
            git tag -f ${{ github.event.inputs.releaseVersion }}           
-           git push --quiet --force ${{ github.event.inputs.releaseVersion }}
\ No newline at end of file
+           git push --quiet --force ${{ github.event.inputs.releaseVersion }}

--
Gitblit v1.10.0