Fix Dapperfile

Signed-off-by: galal-hussein <[email protected]>
rancher · May 24, 2024 · b05a5c8 · b05a5c8
1 parent 902cb68
commit b05a5c8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,12 +22,12 @@ jobs:
           secret/data/github/repo/${{ github.repository }}/aws-s3-bucket/credentials token | AWS_S3_BUCKET ;
           secret/data/github/repo/${{ github.repository }}/aws-secret-access-key/credentials token | AWS_SECRET_ACCESS_KEY ;
           secret/data/github/repo/${{ github.repository }}/private-key/credentials token | PRIVATE_KEY ;
-          secret/data/github/repo/${{ github.repository }}/private-key-pass-phrase/credentials token | PRIVATE_KEY_PASSPHRASE ;
+          secret/data/github/repo/${{ github.repository }}/private-key-pass-phrase/credentials token | PRIVATE_KEY_PASS_PHRASE ;
           secret/data/github/repo/${{ github.repository }}/testing-aws-s3-bucket/credentials token | TESTING_AWS_S3_BUCKET ;
           secret/data/github/repo/${{ github.repository }}/testing-aws-access-key-id/credentials token | TESTING_AWS_ACCESS_KEY_ID ;
           secret/data/github/repo/${{ github.repository }}/testing-aws-secret-access-key/credentials token | TESTING_AWS_SECRET_ACCESS_KEY ;
           secret/data/github/repo/${{ github.repository }}/testing-private-key/credentials token | TESTING_PRIVATE_KEY ;
-          secret/data/github/repo/${{ github.repository }}/testing-private-key-pass-phrase/credentials token | TESTING_PRIVATE_KEY_PASSPHRASE ;
+          secret/data/github/repo/${{ github.repository }}/testing-private-key-pass-phrase/credentials token | TESTING_PRIVATE_KEY_PASS_PHRASE ;
           
     - name: build-rpm-el7
       run: |
@@ -37,22 +37,22 @@ jobs:
       run: |
         make centos7-sign
       env:
-        PRIVATE_KEY: ${{ env.PRIAVATE_KEY }}
-        PRIVATE_KEY_PASSPHRASE: ${{ env.PRIVATE_KEY_PASSPHRASE }}
-        TESTING_PRIVATE_KEY: ${{ env.TESTING_PRIAVATE_KEY }}
-        TESTING_PRIVATE_KEY_PASSPHRASE: ${{ env.TESTING_PRIVATE_KEY_PASSPHRASE }}
+        PRIVATE_KEY: "${{ env.PRIVATE_KEY }}"
+        PRIVATE_KEY_PASS_PHRASE: "${{ env.PRIVATE_KEY_PASS_PHRASE }}"
+        TESTING_PRIVATE_KEY: "${{ env.TESTING_PRIVATE_KEY }}"
+        TESTING_PRIVATE_KEY_PASS_PHRASE: "${{ env.TESTING_PRIVATE_KEY_PASS_PHRASE }}"
 
     - name: upload-repo-el7
       run: |
         make centos7-upload-repo
       env:
         COMBARCH: x86_64-amd64
-        AWS_S3_BUCKET: ${{ env.AWS_S3_BUCKET }}
-        AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
-        TESTING_AWS_S3_BUCKET: ${{ env.TESTING_AWS_S3_BUCKET }}
-        TESTING_AWS_ACCESS_KEY_ID: ${{ env.TESTING_AWS_ACCESS_KEY_ID }}
-        TESTING_AWS_SECRET_ACCESS_KEY: ${{ env.TESTING_AWS_SECRET_ACCESS_KEY }}
+        AWS_S3_BUCKET: "${{ env.AWS_S3_BUCKET }}"
+        AWS_ACCESS_KEY_ID: "${{ env.AWS_ACCESS_KEY_ID }}"
+        AWS_SECRET_ACCESS_KEY: "${{ env.AWS_SECRET_ACCESS_KEY }}"
+        TESTING_AWS_S3_BUCKET: "${{ env.TESTING_AWS_S3_BUCKET }}"
+        TESTING_AWS_ACCESS_KEY_ID: "${{ env.TESTING_AWS_ACCESS_KEY_ID }}"
+        TESTING_AWS_SECRET_ACCESS_KEY: "${{ env.TESTING_AWS_SECRET_ACCESS_KEY }}"
 
     - name: checksum-rpm-el7
       run: |

diff --git a/Dockerfile.centos7.dapper b/Dockerfile.centos7.dapper
@@ -5,7 +5,7 @@ RUN yum install -y epel-release \
 
 ENV DAPPER_SOURCE /source
 ENV DAPPER_OUTPUT ./dist
-ENV DAPPER_ENV COMBARCH DRONE_TAG TAG
+ENV DAPPER_ENV COMBARCH DRONE_TAG TAG PRIVATE_KEY PRIVATE_KEY_PASS_PHRASE TESTING_PRIVATE_KEY TESTING_PRIVATE_KEY_PASS_PHRASE AWS_S3_BUCKET AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY TESTING_AWS_S3_BUCKET TESTING_AWS_ACCESS_KEY_ID TESTING_AWS_SECRET_ACCESS_KEY DEST_DIR CHECKSUM_METHOD CHECKSUM_FILE
 ENV HOME ${DAPPER_SOURCE}
 WORKDIR ${DAPPER_SOURCE}