secrets to environmnet

AllStarLink · Jun 26, 2024 · 209bae5 · 209bae5
1 parent b7cfa05
commit 209bae5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/make_and_publish_pkgs.yml b/.github/workflows/make_and_publish_pkgs.yml
@@ -25,9 +25,13 @@ on:
           - amd64
 jobs:
   make-packages:
+    env:
+      APTLY_API_USER: ${{secrets.APTLY_API_USER}}
+      APTLY_API_PASS: ${{secrets.APTLY_API_PASS}}
+      APTLY_GPG_PASSPHRASE: ${{secrets.APTLY_GPG_PASSPHRASE}}
     uses: AllStarLink/asl3-update-nodelist/.github/workflows/ephemeral_ec2_run-this.yml@develop
     with:
-      run-this: ./builder/dockerbuild.sh -a ${{ inputs.arch	}} -o ${{ inputs.os }} --gh-rel ${{ inputs.gh-rel }} -r ${{ inputs.aptly-repo }} -u ${{secrets.APTLY_API_USER}}:${{secrets.APTLY_API_PASS}} -g ${{secrets.APTLY_GPG_PASSPHRASE}}
+      run-this: ./builder/dockerbuild.sh -a ${{ inputs.arch	}} -o ${{ inputs.os }} --gh-rel ${{ inputs.gh-rel }} -r ${{ inputs.aptly-repo }} 
       arch: ${{ inputs.arch == 'armhf' && 'arm64' || inputs.arch == 'aarch64' && 'arm64' || inputs.arch == 'amd64' && 'x86_64' || inputs.arch == 'riscv64' && 'x86_64' || inputs.arch }}
       artifact-path: '/actions-runner/_work/asl3-update-nodelist/_debs/'
     secrets: inherit
diff --git a/builder/dockerbuild.sh b/builder/dockerbuild.sh
@@ -24,16 +24,6 @@ while [[ $# -gt 0 ]]; do
       APTLY_REPO="asl-$2"
       shift
       shift	
-      ;;
-	-u)
-      APTLY_USER="$2"
-      shift
-      shift
-      ;;
-    -g)
-      APTLY_GPG="$2"
-      shift
-      shift
       ;;
 	-*|--*|*)
       echo "Unknown option $1"
@@ -105,6 +95,8 @@ gh release upload -R AllStarLink/asl3-update-nodelist $GH_REL $ALL_PKG_ROOT/_deb
 
 docker image rm --force $D_TAG
 
+APTLY_USER="${APTLY_API_USER}:${APTLY_API_PASS}"
+
 find $GH_REL $ALL_PKG_ROOT/_debs/*.deb -name "*.deb" | \
 	xargs -I {} -d '\n' curl --fail --user ${APTLY_USER} \
 	-X POST -F 'file=@"{}"' \
@@ -114,6 +106,6 @@ curl --fail --user ${APTLY_USER} -X POST \
 	https://repo-admin.allstarlink.org/api/repos/${APTLY_REPO}/file/${APTLY_REPO}-${OPERATING_SYSTEMS}
 
 curl --fail --user ${APTLY_USER} -X PUT -H "content-Type: application/json" \
-	--data '{"Signing": {"Batch": true, "Passphrase": "${APTLY_GPG}"}}' \
+	--data '{"Signing": {"Batch": true, "Passphrase": "${APTLY_GPG_PASSPHRASE}"}}' \
 	"https://repo-admin.allstarlink.org/api/publish/:./${OPERATING_SYSTEMS}"