diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index d0481a2..08db037 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -53,44 +53,3 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - - deploy: - name: Deploy to Linode - runs-on: ubuntu-latest - needs: build - steps: - - name: Checkout master - uses: actions/checkout@v1 - - name: Add environment variables to .env - run: | - echo "IMAGE=${{ env.IMAGE }}" >> .env - echo "LINODE_USER=${{ secrets.LINODE_USER }}" >> .env - echo "NAMESPACE=${{ secrets.NAMESPACE }}" >> .env - echo "PERSONAL_ACCESS_TOKEN=${{ secrets.PERSONAL_ACCESS_TOKEN }}" >> .env - - name: Add the private SSH key to the ssh-agent - env: - SSH_AUTH_SOCK: /tmp/ssh_agent.sock - run: | - mkdir -p ~/.ssh - ssh-agent -a $SSH_AUTH_SOCK > /dev/null - ssh-keyscan github.com >> ~/.ssh/known_hosts - ssh-add - <<< "${{ secrets.PRIVATE_KEY }}" - - name: Build and deploy images on Linode - env: - SSH_AUTH_SOCK: /tmp/ssh_agent.sock - run: | - scp -o StrictHostKeyChecking=no -r ./.env ${{ secrets.LINODE_USER }}@${{ secrets.LINODE_IP_ADDRESS }}:/home/${{ secrets.LINODE_USER }}/app - ssh -o StrictHostKeyChecking=no ${{ secrets.LINODE_USER }}@${{ secrets.LINODE_IP_ADDRESS }} "\ - export LINODE_USER=$LINODE_USER; \ - export IMAGE=$IMAGE; \ - export NAMESPACE=$NAMESPACE; \ - export PERSONAL_ACCESS_TOKEN=$PERSONAL_ACCESS_TOKEN; \ - bash -s" << 'ENDSSH' - cd /home/proxyuser/app - source .env - docker login ghcr.io -u $NAMESPACE -p $PERSONAL_ACCESS_TOKEN - docker pull $IMAGE - docker stop ln-websocket-proxy - docker rm ln-websocket-proxy - docker run --restart unless-stopped -d --name ln-websocket-proxy -p 8080:8080 $IMAGE - ENDSSH diff --git a/Cargo.lock b/Cargo.lock index 5a83f2b..b3ad987 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -611,6 +611,7 @@ dependencies = [ "bytes", "futures", "headers", + "proc-macro2", "serde", "serde_json", "serde_with", @@ -808,9 +809,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ]