Skip to content

Wk add parser image #268

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
wkelly17 merged 8 commits into from
Jun 26, 2025
Merged

Wk add parser image #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
65ae383
separate usfm parser build and run
wkelly17 Jun 25, 2025
5f3225c
add the tags for parser as well
wkelly17 Jun 25, 2025
7213461
forgot to rename usfm parser image step
wkelly17 Jun 25, 2025
3302747
typd'd the path for parser dockerfile context
wkelly17 Jun 25, 2025
eaeb7fe
make sure tests depend on parser image being built. Default local tag…
wkelly17 Jun 25, 2025
b0a4aff
tag local parser for tests
wkelly17 Jun 25, 2025
ce9bf0d
forgot to change build to word image in docker compose
wkelly17 Jun 25, 2025
08f0c37
build parser image for tests jobs too
wkelly17 Jun 25, 2025
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
60 changes: 55 additions & 5 deletions .github/workflows/docker-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,31 @@ jobs:
cache-from: type=gha
cache-to: type=gha,mode=max

Build-USFMParser-Image:
name: Build USFMParser image
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: FranzDiebold/github-env-vars-action@v2
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- name: Build USFMParser image
uses: docker/build-push-action@v3
with:
context: ./dotnet/USFMParserApi
cache-from: type=gha
cache-to: type=gha,mode=max

Test-API-Image:
name: Test API image
runs-on: ubuntu-24.04
needs: Build-API-Image
needs: [Build-API-Image, Build-USFMParser-Image]
steps:
- uses: actions/checkout@v3
- uses: FranzDiebold/github-env-vars-action@v2
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- name: Build API image with buildx
- name: Build local API image with buildx
uses: docker/build-push-action@v3
with:
context: .
Expand All @@ -53,35 +68,54 @@ jobs:
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Build local USFMParser image with buildx
uses: docker/build-push-action@v3
with:
context: ./dotnet/USFMParserApi
tags: wycliffeassociates/doc-usfmparser:local
load: true
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Test API image with docker-compose
run: |
docker compose -f docker-compose.yml -f docker-compose.api-test.yml up --exit-code-from test-runner

Test-Frontend-Image:
name: Test Frontend image
runs-on: ubuntu-24.04
needs: [Build-API-Image, Build-Frontend-Image]
needs: [Build-API-Image, Build-Frontend-Image, Build-USFMParser-Image]
steps:
- uses: actions/checkout@v3
- uses: FranzDiebold/github-env-vars-action@v2
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- name: Build api image
- name: Build local api image
uses: docker/build-push-action@v3
with:
context: .
tags: wycliffeassociates/doc:local
load: true
cache-from: type=gha
cache-to: type=gha,mode=max
- name: Build frontend image
- name: Build local frontend image
uses: docker/build-push-action@v3
with:
context: ./frontend
tags: wycliffeassociates/doc-ui:local
load: true
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Build local USFMParser image with buildx
uses: docker/build-push-action@v3
with:
context: ./dotnet/USFMParserApi
tags: wycliffeassociates/doc-usfmparser:local
load: true
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Build frontend-tests image
uses: docker/build-push-action@v3
with:
Expand Down Expand Up @@ -120,6 +154,11 @@ jobs:
echo "DOC_UI_TAG_SHA=wycliffeassociates/doc-ui:$GITHUB_SHA" >> $GITHUB_ENV && \
echo "DOC_UI_TAG_BRANCH=wycliffeassociates/doc-ui:$CI_REF_NAME_SLUG" >> $GITHUB_ENV && \
echo "DOC_UI_TAG_LATEST=wycliffeassociates/doc-ui:latest" >> $GITHUB_ENV
- name: Set DOC USFM parser tags
run: |
echo "DOC_PARSER_TAG_SHA=wycliffeassociates/doc-usfmparser:$GITHUB_SHA" >> $GITHUB_ENV && \
echo "DOC_PARSER_TAG_BRANCH=wycliffeassociates/doc-usfmparser:$CI_REF_NAME_SLUG" >> $GITHUB_ENV && \
echo "DOC_PARSER_TAG_LATEST=wycliffeassociates/doc-usfmparser:latest" >> $GITHUB_ENV

- name: Set version inside UI
run: |
Expand Down Expand Up @@ -152,6 +191,17 @@ jobs:
PUBLIC_DOC_BUILD_TIMESTAMP_ARG=${{ env.PUBLIC_DOC_BUILD_TIMESTAMP }}
cache-from: type=gha
cache-to: type=gha,mode=max
- name: Build and conditional push Parser image
uses: docker/build-push-action@v3
with:
context: ./dotnet/USFMParserApi
push: true
tags: |
${{ env.DOC_PARSER_TAG_SHA }}
${{ env.DOC_PARSER_TAG_BRANCH }}
${{ env.DOC_PARSER_TAG_LATEST }}
cache-from: type=gha
cache-to: type=gha,mode=max
Deploy-develop:
name: Develop deploy on successful develop build
needs: [Push-Images]
Expand Down
4 changes: 3 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ services:
retries: 5
restart: unless-stopped
usfmparserapi:
build: ./dotnet/USFMParserApi
image: wycliffeassociates/doc-usfmparser:${IMAGE_TAG}
environment:
IMAGE_TAG: ${IMAGE_TAG:-local}
ports:
- ${DOTNET_API_PORT:-8081}:80
volumes:
Expand Down