From e64ad0eb64863bceca8ac93a6a3c6975c1f8aa5e Mon Sep 17 00:00:00 2001 From: Jason S Fillman <6155956+jsfillman@users.noreply.github.com> Date: Wed, 6 Oct 2021 19:41:47 -0700 Subject: [PATCH 1/6] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index eb7baa5..b66719d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,7 @@ RUN \ net-tools \ netcat \ p7zip-full \ + screen \ ssh \ tzdata \ unzip \ From 453e72c451f80296d3022b1dacfb36b0cc4ac92a Mon Sep 17 00:00:00 2001 From: Jason S Fillman Date: Mon, 1 Nov 2021 13:43:37 -0500 Subject: [PATCH 2/6] Adding gha metadata --- .../workflows/build_prodrc_pr.properties.json | 5 +++++ .../workflows/build_test_pr.properties.json | 5 +++++ .github/workflows/kbase-bot.svg | 4 ++++ .github/workflows/tag_environments.yaml | 19 ------------------- .../workflows/tag_prod_latest.properties.json | 5 +++++ .../workflows/tag_test_latest.properties.json | 5 +++++ 6 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 .github/workflows/build_prodrc_pr.properties.json create mode 100644 .github/workflows/build_test_pr.properties.json create mode 100644 .github/workflows/kbase-bot.svg delete mode 100644 .github/workflows/tag_environments.yaml create mode 100644 .github/workflows/tag_prod_latest.properties.json create mode 100644 .github/workflows/tag_test_latest.properties.json diff --git a/.github/workflows/build_prodrc_pr.properties.json b/.github/workflows/build_prodrc_pr.properties.json new file mode 100644 index 0000000..fd1265e --- /dev/null +++ b/.github/workflows/build_prodrc_pr.properties.json @@ -0,0 +1,5 @@ +{ + "name": "Build Production RC Image", + "description": "Builds the (pre-merge) release candidate image on any PRs to main branch.", + "iconName": "kbase-bot" +} diff --git a/.github/workflows/build_test_pr.properties.json b/.github/workflows/build_test_pr.properties.json new file mode 100644 index 0000000..58c621e --- /dev/null +++ b/.github/workflows/build_test_pr.properties.json @@ -0,0 +1,5 @@ +{ + "name": "Build Develop Image", + "description": "Builds the (pre-merge) {appname}-develop image on any PRs to develop branch.", + "iconName": "kbase-bot" +} diff --git a/.github/workflows/kbase-bot.svg b/.github/workflows/kbase-bot.svg new file mode 100644 index 0000000..6c91dbe --- /dev/null +++ b/.github/workflows/kbase-bot.svg @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/.github/workflows/tag_environments.yaml b/.github/workflows/tag_environments.yaml deleted file mode 100644 index 6dba743..0000000 --- a/.github/workflows/tag_environments.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: Tag Image For Deploy -'on': - repository_dispatch -jobs: - tag_environments: - runs-on: ubuntu-latest - steps: - - name: Check out GitHub Repo - uses: actions/checkout@v2 - - name: Tag Deploy Environments - env: - DOCKER_ACTOR: "${{ secrets.GHCR_USERNAME }}" - DOCKER_TOKEN: ${{ secrets.GHCR_TOKEN }} - IMAGE_TAG: ${{ github.event.client_payload.image_tag }} - SHA: ${{ github.event.pull_request.head.sha }} - TARGET: ${{ github.event.client_payload.target }} - DEV_PROD: ${{ github.event.client_payload.dev_prod }} - run: './.github/workflows/scripts/tag_environments.sh' diff --git a/.github/workflows/tag_prod_latest.properties.json b/.github/workflows/tag_prod_latest.properties.json new file mode 100644 index 0000000..b1fa712 --- /dev/null +++ b/.github/workflows/tag_prod_latest.properties.json @@ -0,0 +1,5 @@ +{ + "name": "Tag Production Latest", + "description": "Tags `latest` on the production image once a merge to main is completed", + "iconName": "kbase-bot" +} diff --git a/.github/workflows/tag_test_latest.properties.json b/.github/workflows/tag_test_latest.properties.json new file mode 100644 index 0000000..c47fba7 --- /dev/null +++ b/.github/workflows/tag_test_latest.properties.json @@ -0,0 +1,5 @@ +{ + "name": "Tag Develop Latest", + "description": "Tags `latest` on the {appname}-develop image once a merge to develop is completed", + "iconName": "kbase-bot" +} From 6647230e2b272addadf2e9967a3e50791a4cbbf3 Mon Sep 17 00:00:00 2001 From: Jason S Fillman <6155956+jsfillman@users.noreply.github.com> Date: Mon, 31 Jan 2022 22:25:58 -0600 Subject: [PATCH 3/6] Adding w8s4 script. --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b66719d..f752235 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,8 @@ RUN \ RUN \ cd /usr/local/bin; \ wget -q https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh; \ - chmod +x /usr/local/bin/wait-for-it.sh + wget -q https://raw.githubusercontent.com/kbase-infra/w8s4/main/w8s4; \ + chmod +x /usr/local/bin/wait-for-it.sh /usr/local/bin/w8s4 # Install minio mc admin utility RUN \ From 8123f407327797f0cbbb0e683ee29fe2fe9d3a2f Mon Sep 17 00:00:00 2001 From: Jason S Fillman <6155956+jsfillman@users.noreply.github.com> Date: Mon, 31 Jan 2022 22:50:06 -0600 Subject: [PATCH 4/6] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 804db53..f846d7c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # init-sidecar + Docker config for the KBase `init-sidecar` and `install` services. For use with Rancher 2. ## Current Status From e172e6445c9ee85d7423ed162c1db5de4b06ea4c Mon Sep 17 00:00:00 2001 From: Jason S Fillman <6155956+jsfillman@users.noreply.github.com> Date: Mon, 31 Jan 2022 23:18:42 -0600 Subject: [PATCH 5/6] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index f846d7c..804db53 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # init-sidecar - Docker config for the KBase `init-sidecar` and `install` services. For use with Rancher 2. ## Current Status From 982bc06f201a86ef32e5736eb3bdf4136a94a525 Mon Sep 17 00:00:00 2001 From: Jason S Fillman <6155956+jsfillman@users.noreply.github.com> Date: Mon, 31 Jan 2022 23:21:29 -0600 Subject: [PATCH 6/6] Update CODEOWNERS Changing out Steve with Boris, so we don't keep bugging Steve for every PR. --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index eb9c80c..ef0229d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -6,4 +6,4 @@ # modifies JS files, only @js-owner and not the global # owner(s) will be requested for a review. -* @kkeller @sychan @jsfillman +* @kkeller @bioboris @jsfillman