diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 33fab56..eae7038 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,16 +4,35 @@ on: branches: main jobs: - deploy: + docker-dh: + name: Push to Docker Hub 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 + - name: Build image for Docker Hub run: docker build . --file Dockerfile --tag luketainton/fhed:latest - - name: Push image + - name: Push image to Docker Hub run: docker push luketainton/fhed:latest + + docker-ghr: + name: Push to GitHub Package Registry + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Login to DockerHub Registry + run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u luketainton --password-stdin + - name: Build image for GitHub Package Registry + run: docker build . --file Dockerfile --tag docker.pkg.github.com/luketainton/fhed/fhed:latest + - name: Push image to GitHub Package Registry + run: docker push docker.pkg.github.com/luketainton/fhed/fhed:latest + + deploy: + name: Update Docker image on server + runs-on: ubuntu-latest + needs: [docker-dh] + steps: - name: Update image on server uses: garygrossgarten/github-action-ssh@release with: diff --git a/app/public/css/custom.css b/app/public/css/custom.css index 6d3a9dc..aee9f9e 100644 --- a/app/public/css/custom.css +++ b/app/public/css/custom.css @@ -63,4 +63,3 @@ code { footer p { margin-bottom: .25rem; } - \ No newline at end of file diff --git a/app/public/existing.php b/app/public/existing.php index bf5d4c3..d3a36d3 100644 --- a/app/public/existing.php +++ b/app/public/existing.php @@ -47,7 +47,7 @@
-
+
My Open Requests
diff --git a/app/public/new.php b/app/public/new.php index ffba1dc..dceb64b 100644 --- a/app/public/new.php +++ b/app/public/new.php @@ -82,7 +82,7 @@
-
+