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 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" +} diff --git a/Dockerfile b/Dockerfile index eb7baa5..f752235 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,7 @@ RUN \ net-tools \ netcat \ p7zip-full \ + screen \ ssh \ tzdata \ unzip \ @@ -24,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 \