Skip to content

Commit

Permalink
Merge pull request #26 from kbase/develop
Browse files Browse the repository at this point in the history
Updating CODEOWNERS & adding w8s4.
  • Loading branch information
jsfillman authored Feb 1, 2022
2 parents e1ed2f0 + c711616 commit 9f7c3b6
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions .github/workflows/build_prodrc_pr.properties.json
Original file line number Diff line number Diff line change
@@ -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"
}
5 changes: 5 additions & 0 deletions .github/workflows/build_test_pr.properties.json
Original file line number Diff line number Diff line change
@@ -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"
}
4 changes: 4 additions & 0 deletions .github/workflows/kbase-bot.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 0 additions & 19 deletions .github/workflows/tag_environments.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions .github/workflows/tag_prod_latest.properties.json
Original file line number Diff line number Diff line change
@@ -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"
}
5 changes: 5 additions & 0 deletions .github/workflows/tag_test_latest.properties.json
Original file line number Diff line number Diff line change
@@ -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"
}
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ RUN \
net-tools \
netcat \
p7zip-full \
screen \
ssh \
tzdata \
unzip \
Expand All @@ -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 \
Expand Down

0 comments on commit 9f7c3b6

Please sign in to comment.