opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

ci: re-add deploy job

Browse source 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e4202a6..c0598b0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ env:
   DOCKER_TAG: ${{ github.sha }}

 jobs:
-  build-and-push-images:
+  build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@5a4ac9002d # v2.3.4
@@ -33,4 +33,22 @@ jobs:
       - run: |
           just push-images ${{ github.sha }}

+  deploy:
+    runs-on: ubuntu-latest
+    needs:
+      - build
+    steps:
+      - uses: actions/checkout@5a4ac9002d # v2.3.4
+      - uses: extractions/setup-just@95b912dc5d # 1.5.0
+
+      - name: Add the deployment SSH key
+        uses: shimataro/ssh-key-action@3c9b0fc6f2 # 2.3.1
+        with:
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          name: id_rsa
+          known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
+
+      - run: |
+          just deploy ${{ github.sha }}
+
 # vim: sw=2 ts=2
diff --git a/justfile b/justfile
index e4916d1..5afe23d 100644
--- a/justfile
+++ b/justfile
@@ -12,11 +12,11 @@ create-daily:
   touch "${filepath}/${filename}"
   eval "${EDITOR}" "${filepath}/${filename}"

-deploy:
+deploy sha:
   rm -fr _deploy
   docker container rm oliverdavies.uk-build || true

-  docker image pull ghcr.io/opdavies/oliverdavies.uk-build
+  docker image pull ghcr.io/opdavies/oliverdavies.uk-build:{{ sha }}
   docker container run --entrypoint sh --name oliverdavies.uk-build ghcr.io/opdavies/oliverdavies.uk-build
   docker container cp oliverdavies.uk-build:/app/ _deploy
This commit is contained in:
Oliver Davies 2022-09-29 23:29:58 +01:00
parent 7baf281e8a
commit 3c7db24f1c
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.github/workflows/ci.yml vendored
View file

@ -14,7 +14,7 @@ env:
DOCKER_TAG: ${{ github.sha }} DOCKER_TAG: ${{ github.sha }}
jobs: jobs:
build-and-push-images: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
@ -33,4 +33,22 @@ jobs:
- run: | - run: |
just push-images ${{ github.sha }} just push-images ${{ github.sha }}
deploy:
runs-on: ubuntu-latest
needs:
- build
steps:
- uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
- uses: extractions/setup-just@95b912dc5d3ed106a72907f2f9b91e76d60bdb76 # 1.5.0
- name: Add the deployment SSH key
uses: shimataro/ssh-key-action@3c9b0fc6f2d223b8450b02a0445f526350fc73e0 # 2.3.1
with:
key: ${{ secrets.SSH_PRIVATE_KEY }}
name: id_rsa
known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
- run: |
just deploy ${{ github.sha }}
# vim: sw=2 ts=2 # vim: sw=2 ts=2

6
justfile
View file

@ -12,11 +12,11 @@ create-daily:
touch "${filepath}/${filename}" touch "${filepath}/${filename}"
eval "${EDITOR}" "${filepath}/${filename}" eval "${EDITOR}" "${filepath}/${filename}"
deploy: deploy sha:
rm -fr _deploy rm -fr _deploy
docker container rm oliverdavies.uk-build || true docker container rm oliverdavies.uk-build || true
docker image pull ghcr.io/opdavies/oliverdavies.uk-build docker image pull ghcr.io/opdavies/oliverdavies.uk-build:{{ sha }}
docker container run --entrypoint sh --name oliverdavies.uk-build ghcr.io/opdavies/oliverdavies.uk-build docker container run --entrypoint sh --name oliverdavies.uk-build ghcr.io/opdavies/oliverdavies.uk-build
docker container cp oliverdavies.uk-build:/app/ _deploy docker container cp oliverdavies.uk-build:/app/ _deploy
@ -24,7 +24,7 @@ deploy:
tree -L 2 _deploy tree -L 2 _deploy
rsync -r -avhP --delete _deploy/* 104.248.165.137:/srv/oliverdavies.uk rsync -r -avhP --delete _deploy/* opdavies@104.248.165.137:/srv/oliverdavies.uk
build-images sha: build-images sha:
docker image build \ docker image build \