From 36c59f83f4b5d14bc18a85955568a29e21d67011 Mon Sep 17 00:00:00 2001 From: Skylar Grant Date: Mon, 31 Jul 2023 16:03:25 -0400 Subject: [PATCH 01/11] Change dispatch to pull req --- .github/workflows/docker-image-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-prod.yml b/.github/workflows/docker-image-prod.yml index 46e5047..360975b 100755 --- a/.github/workflows/docker-image-prod.yml +++ b/.github/workflows/docker-image-prod.yml @@ -1,7 +1,7 @@ name: Silvanus Production Dockerization on: - merge: + pull_request: branches: - main From 11465287dd35650876c71a0916ef8f83e025dace Mon Sep 17 00:00:00 2001 From: Skylar Grant Date: Mon, 31 Jul 2023 16:05:40 -0400 Subject: [PATCH 02/11] Update uses declaration --- .github/workflows/docker-image-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-prod.yml b/.github/workflows/docker-image-prod.yml index 360975b..8a59c2a 100755 --- a/.github/workflows/docker-image-prod.yml +++ b/.github/workflows/docker-image-prod.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: https://github.com/actions/checkout@v3 - name: Build the Docker image v0idf1sh/silvanus run: docker build . --file Dockerfile --tag v0idf1sh/silvanus - name: Log into Docker Hub From ba0e4625c0f573b4c8c2e801d6e95761bea6b5a0 Mon Sep 17 00:00:00 2001 From: Skylar Grant Date: Mon, 31 Jul 2023 16:07:43 -0400 Subject: [PATCH 03/11] Remove host --- .github/workflows/docker-image-prod.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker-image-prod.yml b/.github/workflows/docker-image-prod.yml index 8a59c2a..7a10f8a 100755 --- a/.github/workflows/docker-image-prod.yml +++ b/.github/workflows/docker-image-prod.yml @@ -16,7 +16,6 @@ jobs: runs-on: ubuntu-latest steps: - - uses: https://github.com/actions/checkout@v3 - name: Build the Docker image v0idf1sh/silvanus run: docker build . --file Dockerfile --tag v0idf1sh/silvanus - name: Log into Docker Hub From 805c20953c23082cf37e009a4d5dc088842bb8a1 Mon Sep 17 00:00:00 2001 From: Skylar Grant Date: Mon, 31 Jul 2023 16:12:58 -0400 Subject: [PATCH 04/11] Fixes --- .github/workflows/docker-image-prod.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image-prod.yml b/.github/workflows/docker-image-prod.yml index 7a10f8a..17511fd 100755 --- a/.github/workflows/docker-image-prod.yml +++ b/.github/workflows/docker-image-prod.yml @@ -16,9 +16,11 @@ jobs: runs-on: ubuntu-latest steps: - - name: Build the Docker image v0idf1sh/silvanus + - name: Install Docker + run: curl -fsSL https://get.docker.com | sh + - name: Build the Docker image run: docker build . --file Dockerfile --tag v0idf1sh/silvanus - name: Log into Docker Hub run: docker login -u $DHUB_UNAME -p $DHUB_PWORD - - name: Push image to Docker Hub v0idf1sh/silvanus + - name: Push image to Docker Hub run: docker push v0idf1sh/silvanus \ No newline at end of file From 22005ac68f9cd60990cd4f10e5864c6148e64385 Mon Sep 17 00:00:00 2001 From: Skylar Grant Date: Mon, 31 Jul 2023 16:21:21 -0400 Subject: [PATCH 05/11] asd;flkasdj; --- .github/workflows/docker-image-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-prod.yml b/.github/workflows/docker-image-prod.yml index 17511fd..9e7891b 100755 --- a/.github/workflows/docker-image-prod.yml +++ b/.github/workflows/docker-image-prod.yml @@ -13,7 +13,7 @@ jobs: build: - runs-on: ubuntu-latest + runs-on: self-hosted steps: - name: Install Docker From 45418e2bd6c80692404e29cfb7640195342d4300 Mon Sep 17 00:00:00 2001 From: Skylar Grant Date: Mon, 31 Jul 2023 16:23:03 -0400 Subject: [PATCH 06/11] Fixed I hope --- .github/workflows/docker-image-prod.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker-image-prod.yml b/.github/workflows/docker-image-prod.yml index 9e7891b..4476281 100755 --- a/.github/workflows/docker-image-prod.yml +++ b/.github/workflows/docker-image-prod.yml @@ -16,8 +16,6 @@ jobs: runs-on: self-hosted steps: - - name: Install Docker - run: curl -fsSL https://get.docker.com | sh - name: Build the Docker image run: docker build . --file Dockerfile --tag v0idf1sh/silvanus - name: Log into Docker Hub From 1e1d0cddaa1695fbc6da02eb8d96791f826bfb59 Mon Sep 17 00:00:00 2001 From: Skylar Grant Date: Mon, 31 Jul 2023 16:35:33 -0400 Subject: [PATCH 07/11] Moar fixxed?! --- .github/workflows/docker-image-prod.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/docker-image-prod.yml b/.github/workflows/docker-image-prod.yml index 4476281..bdef1d5 100755 --- a/.github/workflows/docker-image-prod.yml +++ b/.github/workflows/docker-image-prod.yml @@ -16,6 +16,12 @@ jobs: runs-on: self-hosted steps: + - name: Move into build directory + run: cd /home/git/silvanus + - name: Pull latest files + run: git pull + - name: Checkout from HEAD + run: git checkout $GITHUB_HEAD_REF - name: Build the Docker image run: docker build . --file Dockerfile --tag v0idf1sh/silvanus - name: Log into Docker Hub From 67483697f0da67e3ff2256dedfc3260cdd2b686b Mon Sep 17 00:00:00 2001 From: Skylar Grant Date: Mon, 31 Jul 2023 16:40:48 -0400 Subject: [PATCH 08/11] Attempt #243095 --- .github/workflows/docker-image-prod.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-image-prod.yml b/.github/workflows/docker-image-prod.yml index bdef1d5..08675fe 100755 --- a/.github/workflows/docker-image-prod.yml +++ b/.github/workflows/docker-image-prod.yml @@ -16,15 +16,18 @@ jobs: runs-on: self-hosted steps: - - name: Move into build directory - run: cd /home/git/silvanus - - name: Pull latest files - run: git pull - - name: Checkout from HEAD - run: git checkout $GITHUB_HEAD_REF + - name: Pull latest from Git + run: | + cd /home/git/silvanus + git pull + git checkout $GITHUB_HEAD_REF - name: Build the Docker image - run: docker build . --file Dockerfile --tag v0idf1sh/silvanus + run: | + cd /home/git/silvanus + docker build . --file Dockerfile --tag v0idf1sh/silvanus - name: Log into Docker Hub run: docker login -u $DHUB_UNAME -p $DHUB_PWORD - name: Push image to Docker Hub - run: docker push v0idf1sh/silvanus \ No newline at end of file + run: | + cd /home/git/silvanus + docker push v0idf1sh/silvanus \ No newline at end of file From 40fc6838a08b8192db17899f36dde506b49ea7db Mon Sep 17 00:00:00 2001 From: Skylar Grant Date: Mon, 31 Jul 2023 16:41:52 -0400 Subject: [PATCH 09/11] Debug --- .github/workflows/docker-image-prod.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker-image-prod.yml b/.github/workflows/docker-image-prod.yml index 08675fe..8a3fc8f 100755 --- a/.github/workflows/docker-image-prod.yml +++ b/.github/workflows/docker-image-prod.yml @@ -18,6 +18,8 @@ jobs: steps: - name: Pull latest from Git run: | + pwd + whoami cd /home/git/silvanus git pull git checkout $GITHUB_HEAD_REF From e303651f53022a7d75590b29dda45a20fb631c8b Mon Sep 17 00:00:00 2001 From: Skylar Grant Date: Mon, 31 Jul 2023 16:43:24 -0400 Subject: [PATCH 10/11] Dubious --- .github/workflows/docker-image-prod.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image-prod.yml b/.github/workflows/docker-image-prod.yml index 8a3fc8f..8ff7d65 100755 --- a/.github/workflows/docker-image-prod.yml +++ b/.github/workflows/docker-image-prod.yml @@ -20,16 +20,16 @@ jobs: run: | pwd whoami - cd /home/git/silvanus + cd /home/root/silvanus git pull git checkout $GITHUB_HEAD_REF - name: Build the Docker image run: | - cd /home/git/silvanus + cd /home/root/silvanus docker build . --file Dockerfile --tag v0idf1sh/silvanus - name: Log into Docker Hub run: docker login -u $DHUB_UNAME -p $DHUB_PWORD - name: Push image to Docker Hub run: | - cd /home/git/silvanus + cd /home/root/silvanus docker push v0idf1sh/silvanus \ No newline at end of file From ba81f01fa043e21c68c79fc3cd445df27d499d66 Mon Sep 17 00:00:00 2001 From: Skylar Grant Date: Mon, 31 Jul 2023 16:43:54 -0400 Subject: [PATCH 11/11] Even more dubious --- .github/workflows/docker-image-prod.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image-prod.yml b/.github/workflows/docker-image-prod.yml index 8ff7d65..2e65b37 100755 --- a/.github/workflows/docker-image-prod.yml +++ b/.github/workflows/docker-image-prod.yml @@ -20,16 +20,16 @@ jobs: run: | pwd whoami - cd /home/root/silvanus + cd /root/silvanus git pull git checkout $GITHUB_HEAD_REF - name: Build the Docker image run: | - cd /home/root/silvanus + cd /root/silvanus docker build . --file Dockerfile --tag v0idf1sh/silvanus - name: Log into Docker Hub run: docker login -u $DHUB_UNAME -p $DHUB_PWORD - name: Push image to Docker Hub run: | - cd /home/root/silvanus + cd /root/silvanus docker push v0idf1sh/silvanus \ No newline at end of file