From 0e53516e031e40a3423259d6ddf9c93e180a9437 Mon Sep 17 00:00:00 2001 From: Luke Tainton Date: Thu, 6 Aug 2020 18:52:41 +0100 Subject: [PATCH 1/2] :construction_worker: Auto-deploy to production once changes are merged Signed-off-by: Luke Tainton --- .github/workflows/deploy.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..33fab56 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,24 @@ +name: Deploy +on: + push: + branches: main + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Login to DockerHub Registry + run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin + - name: Build image + run: docker build . --file Dockerfile --tag luketainton/fhed:latest + - name: Push image + run: docker push luketainton/fhed:latest + - name: Update image on server + uses: garygrossgarten/github-action-ssh@release + with: + command: cd /docker/active/fhed && docker-compose pull && docker-compose up -d + host: ${{ secrets.SSH_HOST }} + port: ${{ secrets.SSH_PORT }} + username: ${{ secrets.SSH_USERNAME }} + privateKey: ${{ secrets.SSH_SSHKEY }} From 2bcead41048c6a8c45dcb255ae82ec35e2cb0a83 Mon Sep 17 00:00:00 2001 From: Alexander Davis Date: Thu, 6 Aug 2020 18:47:55 +0100 Subject: [PATCH 2/2] Update existing.php --- app/public/existing.php | 43 ----------------------------------------- 1 file changed, 43 deletions(-) diff --git a/app/public/existing.php b/app/public/existing.php index 3a2eb07..9cbec7d 100644 --- a/app/public/existing.php +++ b/app/public/existing.php @@ -33,49 +33,6 @@ - -
- - -
-
-

Open requests

-

- Here you can find all of your requests, and other requests that you are subscribed to. -

-
-
- -
-

This page is currently under construction.

-
- -
- -
- - -
- - - - - - - - - - - - -