Skip to content

Update wordcount docker build process #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 4, 2024
Merged

Update wordcount docker build process #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06da547
update github action and version
longshuicy Mar 4, 2024
f50ee92
this repo doesn't have main
longshuicy Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Docker
# This will run when:
# - a new release is created, to make sure the right tags of the
# docker images are pushed (expects tags to be v1.8.4).
# - when new code is pushed to main/develop to push the tags
# - when new code is pushed to master/develop to push the tags
# latest and develop
# - when a pull request is created and updated to make sure the
# Dockerfile is still valid.
Expand All @@ -18,7 +18,7 @@ on:

pull_request:

# Certain actions will only run when this is the main repo.
# Certain actions will only run when this is the master repo.
env:
MAIN_REPO: clowder-framework/pyclowder
DOCKERHUB_ORG: clowder
Expand All @@ -37,7 +37,7 @@ jobs:
include:
- name: wordcount
FOLDER: sample-extractors/wordcount
PLATFORM: "linux/amd64,linux/arm64"
PLATFORM: "linux/amd64"
steps:
- uses: actions/checkout@v2

Expand All @@ -56,7 +56,7 @@ jobs:
# should we push to dockerhub, and is there a README
DOCKERHUB_PUSH="false"
DOCKERHUB_README="false"
if [ "$BRANCH" == "main" -a "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then
if [ "$BRANCH" == "master" -a "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then
if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then
DOCKERHUB_PUSH="true"
if [ -e "${{ matrix.FOLDER }}/README.md" ]; then
Expand All @@ -66,7 +66,7 @@ jobs:
fi

# calculate the version and all tags
if [ "$BRANCH" == "main" ]; then
if [ "$BRANCH" == "master" ]; then
VERSION="$(awk '/"version":/ { print $2 }' ${{ matrix.FOLDER }}/extractor_info.json | sed 's/^.*"\([0-9\.]*\)".*$/\1/')"
tags="latest"
oldversion=""
Expand Down
2 changes: 1 addition & 1 deletion sample-extractors/wordcount/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pyclowder==3.0.2
pyclowder==3.0.7