From 5448f2a426ea9196424019ef683f8efa7de7bd99 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 19:11:22 -0400 Subject: [PATCH 01/14] delete unneeded files. --- .gitea/workflows/demo.yml | 18 ------------------ build_develop.sh | 7 ------- build_release.sh | 17 ----------------- 3 files changed, 42 deletions(-) delete mode 100644 .gitea/workflows/demo.yml delete mode 100755 build_develop.sh delete mode 100644 build_release.sh diff --git a/.gitea/workflows/demo.yml b/.gitea/workflows/demo.yml deleted file mode 100644 index e007988..0000000 --- a/.gitea/workflows/demo.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: GitHub Actions Demo -run-name: ${{ github.actor }} is testing out GitHub Actions 🚀 -on: [push] -jobs: - Explore-GitHub-Actions: - runs-on: ubuntu-latest - steps: - - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." - - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" - - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." - - name: Check out repository code - uses: actions/checkout@v3 - - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner." - - run: echo "🖥️ The workflow is now ready to test your code on the runner." - - name: List files in the repository - run: | - ls ${{ github.workspace }} - - run: echo "🍏 This job's status is ${{ job.status }}." diff --git a/build_develop.sh b/build_develop.sh deleted file mode 100755 index abd2e50..0000000 --- a/build_develop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -x - -# this file is intended to build the docker image and push to the correct repository. Intended to be run by my buildbot instance. - -# build, tag, and push develop -docker build -t viker.cheezers.net:5000/agon:develop . -docker push viker.cheezers.net:5000/agon:develop \ No newline at end of file diff --git a/build_release.sh b/build_release.sh deleted file mode 100644 index 80d9819..0000000 --- a/build_release.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -x - -# this file is intended to build the docker image and push to the correct repository. Intended to be run by my buildbot instance. - -# check if there is a git tag. if so, tag with that tag and release -# expecting tag to be 6 characters long. otherwise isn't not the right tag -GITTAG=$(git describe --tags) -length=${#GITTAG} - -if [ $length -eq 6 ]; then - docker build -t viker.cheezers.net:5000/agon:release -t viker.cheezers.net:5000/agon:$GITTAG . - docker push viker.cheezers.net:5000/agon:release - docker push viker.cheezers.net:5000/agon:$GITTAG -else - docker build -t viker.cheezers.net:5000/agon:release . - docker push viker.cheezers.net:5000/agon:release -fi \ No newline at end of file From 2e681be6908e2215a19fb2862654fb2e4cbecca6 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 19:12:03 -0400 Subject: [PATCH 02/14] try adding buildx to fix missing token. --- .gitea/workflows/build_develop.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 391ca16..ba077c1 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -1,8 +1,9 @@ name: build_develop -on: - push: - branches: [develop] +on: [push] +# commenting out develop push while testing workflow +# push: +# branches: [develop] jobs: build: @@ -12,6 +13,8 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 - name: Build and push to viker registry uses: docker/build-push-action@v4 with: From 6c1505685ba9b76b19b3ffc4a24fe332b8754d19 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 19:15:15 -0400 Subject: [PATCH 03/14] correct http url, try again without buildx. --- .gitea/workflows/build_develop.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index ba077c1..963c2b7 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -13,11 +13,11 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v2 - name: Build and push to viker registry uses: docker/build-push-action@v4 with: context: . push: true - tags: viker.cheezers.net:5000/agon:develop + tags: http://viker.cheezers.net:5000/agon:develop From 106b394c44e87fe9cbdf0d02d44b3f89bb04a16b Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 19:16:54 -0400 Subject: [PATCH 04/14] Need buildx, don't understand why. --- .gitea/workflows/build_develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 963c2b7..315dbb7 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -13,8 +13,8 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - # - name: Set up Docker Buildx - # uses: docker/setup-buildx-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 - name: Build and push to viker registry uses: docker/build-push-action@v4 with: From ac11f3e46252ca8f61bb2faff28bf0445a3e4d3a Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 19:22:18 -0400 Subject: [PATCH 05/14] try localhost for repo. --- .gitea/workflows/build_develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 315dbb7..ad67089 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -20,4 +20,4 @@ jobs: with: context: . push: true - tags: http://viker.cheezers.net:5000/agon:develop + tags: localhost:5000/agon:develop From eaa342d47998e83854dd9b83698e2a7a57de18f6 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 19:34:27 -0400 Subject: [PATCH 06/14] try with docker commands instead of action. --- .gitea/workflows/build_develop.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index ad67089..cf7a611 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -13,11 +13,13 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Build and push to viker registry - uses: docker/build-push-action@v4 - with: - context: . - push: true - tags: localhost:5000/agon:develop + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v2 + # - name: Build and push to viker registry + # uses: docker/build-push-action@v4 + # with: + # context: . + # push: true + # tags: viker.cheezers.net:5000/agon:develop + - run: docker build -t viker.cheezers.net:5000/agon:develop . + - run: docker push viker.cheezers.net:5000/agon:develop From e6f3fcb604dfe3a8deebd8bcc3ce2dc068eb9f41 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 19:35:11 -0400 Subject: [PATCH 07/14] maybe need buildx to set up docker --- .gitea/workflows/build_develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index cf7a611..9ddb48f 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -13,8 +13,8 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - # - name: Set up Docker Buildx - # uses: docker/setup-buildx-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 # - name: Build and push to viker registry # uses: docker/build-push-action@v4 # with: From 13f5bc0aabe8ff9ddc80e19494b325af5da8d2d0 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 21:47:28 -0400 Subject: [PATCH 08/14] try https url --- .gitea/workflows/build_develop.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 9ddb48f..872c257 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -15,11 +15,13 @@ jobs: fetch-depth: 0 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - # - name: Build and push to viker registry - # uses: docker/build-push-action@v4 - # with: - # context: . - # push: true - # tags: viker.cheezers.net:5000/agon:develop - - run: docker build -t viker.cheezers.net:5000/agon:develop . - - run: docker push viker.cheezers.net:5000/agon:develop + - name: Build and push to viker registry + uses: docker/build-push-action@v4 + with: + context: . + push: true + tags: registry.cheezers.net/agon:develop + + # docker isn't installed?? + # - run: docker build -t viker.cheezers.net:5000/agon:develop . + # - run: docker push viker.cheezers.net:5000/agon:develop From ddf319b9d5eeec4c3a90596fd543fe01dd8158fb Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 22:27:05 -0400 Subject: [PATCH 09/14] Install docker onto image. --- .gitea/workflows/build_develop.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 872c257..5e76305 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -13,15 +13,11 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + - name: Install Docker + uses: https://github/papodaca/install-docker-action@v1 - name: Build and push to viker registry uses: docker/build-push-action@v4 with: context: . push: true tags: registry.cheezers.net/agon:develop - - # docker isn't installed?? - # - run: docker build -t viker.cheezers.net:5000/agon:develop . - # - run: docker push viker.cheezers.net:5000/agon:develop From 0513df944f7d219be974478c71d3f11550a3a09b Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 22:31:42 -0400 Subject: [PATCH 10/14] correct github address. --- .gitea/workflows/build_develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 5e76305..7a9c33f 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -14,7 +14,7 @@ jobs: with: fetch-depth: 0 - name: Install Docker - uses: https://github/papodaca/install-docker-action@v1 + uses: https://github.com/papodaca/install-docker-action@v1 - name: Build and push to viker registry uses: docker/build-push-action@v4 with: From 2f8958835815f780757e91a55952cc419d0b5253 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 23:14:15 -0400 Subject: [PATCH 11/14] Don't use action due to using local repo. --- .gitea/workflows/build_develop.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 7a9c33f..fce8471 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -15,9 +15,7 @@ jobs: fetch-depth: 0 - name: Install Docker uses: https://github.com/papodaca/install-docker-action@v1 - - name: Build and push to viker registry - uses: docker/build-push-action@v4 - with: - context: . - push: true - tags: registry.cheezers.net/agon:develop + - name: Build Docker Image + run: docker build -t viker.cheezers.net:5000/agon:develop . + - name: Push Docker Image + run: docker push viker.cheezers.net:5000/agon:develop From 3b49a6ec2a4a04517cb99f7773f03f5d8e644e4b Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 23:25:26 -0400 Subject: [PATCH 12/14] Change workflow back to develop branch. --- .gitea/workflows/build_develop.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index fce8471..62a8f8d 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -1,9 +1,8 @@ name: build_develop on: [push] -# commenting out develop push while testing workflow -# push: -# branches: [develop] + push: + branches: [develop] jobs: build: From 3860e7457979f2f5e485bebabe582f1221287469 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Thu, 23 Mar 2023 09:09:41 -0400 Subject: [PATCH 13/14] Change to operate on the main branch. No need for dev branch. --- .gitea/workflows/build_develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 62a8f8d..b52f4b5 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -2,7 +2,7 @@ name: build_develop on: [push] push: - branches: [develop] + branches: [main] jobs: build: From 3ddfdfe9b04a938ac87ebbe3d0be626a85edc680 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Thu, 23 Mar 2023 09:16:01 -0400 Subject: [PATCH 14/14] Add release workflow. --- .gitea/workflows/build_release.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .gitea/workflows/build_release.yml diff --git a/.gitea/workflows/build_release.yml b/.gitea/workflows/build_release.yml new file mode 100644 index 0000000..87c12cd --- /dev/null +++ b/.gitea/workflows/build_release.yml @@ -0,0 +1,22 @@ +name: build_release + +on: [push] + push: + tags: ['*'] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout Code + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Install Docker + uses: https://github.com/papodaca/install-docker-action@v1 + - name: Build Docker Images + run: docker build -t viker.cheezers.net:5000/agon:latest -t viker.cheezers.net:5000/agon:${{env.BRANCH_TAG}} . + - name: Push Latest Image + run: docker push viker.cheezers.net:5000/agon:latest + - name: Push Tagged Image + run: docker push viker.cheezers.net:5000/agon:${{env.BRANCH_TAG}}