From ce9516ef7532fecdfb106d4cc5a2a5a3aad2df17 Mon Sep 17 00:00:00 2001 From: Jason S Fillman <6155956+jsfillman@users.noreply.github.com> Date: Tue, 23 Apr 2024 18:05:38 -0700 Subject: [PATCH 1/5] Update Readme.md --- Readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Readme.md b/Readme.md index 5c0dd12..85b21a5 100644 --- a/Readme.md +++ b/Readme.md @@ -1,6 +1,6 @@ ### db_zip2cloud -This is a container for backing up databases such as ArangoDB, compressing the backups and then synchronizing a remote S3 bucket against a local archive of the compressed backups +This is a simple cron container for backing up databases such as ArangoDB, compressing the backups and then synchronizing a remote S3 bucket against a local archive of the compressed backups ## Operation @@ -20,4 +20,4 @@ The following environment variables need to be passed into the runtime environme The following volumes need to be mounted into the running container: * /dump/ - Directory either containing existing DB dumps or which will be the destination for a DB dump. -* /zip/ - Directory for writing the compressed/encrypted DB dumps before copying to the S3 remote \ No newline at end of file +* /zip/ - Directory for writing the compressed/encrypted DB dumps before copying to the S3 remote From 1ef9cd0a86009c35439e4ad95c06a15febd4cf6b Mon Sep 17 00:00:00 2001 From: Jason S Fillman <6155956+jsfillman@users.noreply.github.com> Date: Tue, 23 Apr 2024 18:12:11 -0700 Subject: [PATCH 2/5] Update manual-build.yml --- .github/workflows/manual-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 5eb59c2..dbbf15e 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -9,7 +9,7 @@ on: default: 'linux/amd64,linux/arm64/v8' jobs: build-push: - uses: kbase/.github/.github/workflows/reusable_build-push.yml@multi-target + uses: kbase/.github/.github/workflows/reusable_build-push.yml@develop with: name: '${{ github.event.repository.name }}-develop' tags: br-${{ github.ref_name }} From be644e33ed81605b7ee6f5feb74f9c01f050b1a3 Mon Sep 17 00:00:00 2001 From: Jason S Fillman <6155956+jsfillman@users.noreply.github.com> Date: Tue, 23 Apr 2024 18:13:05 -0700 Subject: [PATCH 3/5] Update pr_build.yml --- .github/workflows/pr_build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index b399fa4..e826f2b 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -14,13 +14,13 @@ on: jobs: build-develop-open: if: github.base_ref == 'develop' && github.event.pull_request.merged == false - uses: kbase/.github/.github/workflows/reusable_build.yml@multi-target + uses: kbase/.github/.github/workflows/reusable_build.yml@develop with: platforms: "linux/amd64,linux/arm64/v8" secrets: inherit build-develop-merge: if: github.base_ref == 'develop' && github.event.pull_request.merged == true - uses: kbase/.github/.github/workflows/reusable_build-push.yml@multi-target + uses: kbase/.github/.github/workflows/reusable_build-push.yml@develop with: name: '${{ github.event.repository.name }}-develop' tags: pr-${{ github.event.number }},latest @@ -28,7 +28,7 @@ jobs: secrets: inherit build-main-open: if: (github.base_ref == 'main' || github.base_ref == 'master') && github.event.pull_request.merged == false - uses: kbase/.github/.github/workflows/reusable_build-push.yml@multi-target + uses: kbase/.github/.github/workflows/reusable_build-push.yml@develop with: name: '${{ github.event.repository.name }}' tags: pr-${{ github.event.number }} @@ -36,7 +36,7 @@ jobs: secrets: inherit build-main-merge: if: (github.base_ref == 'main' || github.base_ref == 'master') && github.event.pull_request.merged == true - uses: kbase/.github/.github/workflows/reusable_build-push.yml@multi-target + uses: kbase/.github/.github/workflows/reusable_build-push.yml@develop with: name: '${{ github.event.repository.name }}' tags: pr-${{ github.event.number }},latest-rc @@ -44,5 +44,5 @@ jobs: secrets: inherit trivy-scans: if: (github.base_ref == 'develop' || github.base_ref == 'main' || github.base_ref == 'master' ) && github.event.pull_request.merged == false - uses: kbase/.github/.github/workflows/reusable_trivy-scans.yml@multi-target + uses: kbase/.github/.github/workflows/reusable_trivy-scans.yml@develop secrets: inherit From 63b25d3109b3a44f8093f98eb2e69a9b0c883bd5 Mon Sep 17 00:00:00 2001 From: Jason S Fillman <6155956+jsfillman@users.noreply.github.com> Date: Tue, 23 Apr 2024 18:13:30 -0700 Subject: [PATCH 4/5] Update release-main.yml --- .github/workflows/release-main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-main.yml b/.github/workflows/release-main.yml index 66bf1ce..be252a3 100644 --- a/.github/workflows/release-main.yml +++ b/.github/workflows/release-main.yml @@ -8,17 +8,17 @@ on: types: [ published ] jobs: check-source-branch: - uses: kbase/.github/.github/workflows/reusable_validate-branch.yml@multi-target + uses: kbase/.github/.github/workflows/reusable_validate-branch.yml@develop with: build_branch: '${{ github.event.release.target_commitish }}' validate-release-tag: needs: check-source-branch - uses: kbase/.github/.github/workflows/reusable_validate-release-tag.yml@multi-target + uses: kbase/.github/.github/workflows/reusable_validate-release-tag.yml@develop with: release_tag: '${{ github.event.release.tag_name }}' build-push: needs: validate-release-tag - uses: kbase/.github/.github/workflows/reusable_build-push.yml@multi-target + uses: kbase/.github/.github/workflows/reusable_build-push.yml@develop with: name: '${{ github.event.repository.name }}' tags: '${{ github.event.release.tag_name }},latest' From 0274fca421a2945e6396c1b84f1b90e5c4e0c7e3 Mon Sep 17 00:00:00 2001 From: JS Fillman Date: Tue, 23 Apr 2024 18:37:47 -0700 Subject: [PATCH 5/5] Testing .github PR 50 w/o platform defined --- .github/workflows/pr_build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index e826f2b..d6cd055 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -15,8 +15,8 @@ jobs: build-develop-open: if: github.base_ref == 'develop' && github.event.pull_request.merged == false uses: kbase/.github/.github/workflows/reusable_build.yml@develop - with: - platforms: "linux/amd64,linux/arm64/v8" +# with: +# platforms: "linux/amd64,linux/arm64/v8" secrets: inherit build-develop-merge: if: github.base_ref == 'develop' && github.event.pull_request.merged == true @@ -24,7 +24,7 @@ jobs: with: name: '${{ github.event.repository.name }}-develop' tags: pr-${{ github.event.number }},latest - platforms: "linux/amd64,linux/arm64/v8" +# platforms: "linux/amd64,linux/arm64/v8" secrets: inherit build-main-open: if: (github.base_ref == 'main' || github.base_ref == 'master') && github.event.pull_request.merged == false @@ -32,7 +32,7 @@ jobs: with: name: '${{ github.event.repository.name }}' tags: pr-${{ github.event.number }} - platforms: "linux/amd64,linux/arm64/v8" +# platforms: "linux/amd64,linux/arm64/v8" secrets: inherit build-main-merge: if: (github.base_ref == 'main' || github.base_ref == 'master') && github.event.pull_request.merged == true @@ -40,7 +40,7 @@ jobs: with: name: '${{ github.event.repository.name }}' tags: pr-${{ github.event.number }},latest-rc - platforms: "linux/amd64,linux/arm64/v8" +# platforms: "linux/amd64,linux/arm64/v8" secrets: inherit trivy-scans: if: (github.base_ref == 'develop' || github.base_ref == 'main' || github.base_ref == 'master' ) && github.event.pull_request.merged == false