Merge pull request #1609 from codeforpdx/revert-1607-update-ci

Revert "Update staging CI"
codeforpdx · Mar 15, 2022 · 37f0af4 · 37f0af4
2 parents a75044d + 495c654
commit 37f0af4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -14,9 +14,9 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y make rsync git apt-transport-https ca-certificates curl gnupg lsb-release
-          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-          echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+          sudo apt-get install -y make rsync git apt-transport-https ca-certificates curl gnupg-agent software-properties-common
+          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+          sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
           sudo apt-get update
           sudo apt-get install docker-ce docker-ce-cli containerd.io
       - uses: actions/checkout@v2