Skip to content

Commit

Permalink
Merge branch 'develop' into Add-note-Tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Agaba-derrick authored Jan 9, 2025
2 parents 57be4ed + e0a6881 commit 6ec7064
Show file tree
Hide file tree
Showing 65 changed files with 2,794 additions and 593 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ jobs:
- name: check formatting
run: mvn spotless:check

- name: Initialize and build submodules
run: |
cd dataexport
mvn clean install
cd ..
# - name: Initialize and build submodules
# run: |
# cd dataexport
# mvn clean install
# cd ..

- name: Build OpenELIS-Global2
run: mvn clean install -Dspotless.check.skip=true
Expand Down
95 changes: 4 additions & 91 deletions .github/workflows/publish-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,90 +19,6 @@ env:
DOCKER_TEST_NAME: ${{ vars.DOCKERHUB_USERNAME }}/openelis-global-2-test

jobs:
build-and-push-image-backend-dev:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
submodules: recursive

# Add support for more platforms with QEMU (optional)
# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ vars.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.DOCKER_NAME }}-dev

- name: Build and push Docker image
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile.dev
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}:buildcache-dev
cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}:buildcache-dev,mode=max
build-args: SKIP_SPOTLESS=true

build-and-push-image-frontend-dev:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: Checkout repository
uses: actions/checkout@v4

# Add support for more platforms with QEMU (optional)
# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ vars.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.DOCKER_NAME }}-frontend-dev

- name: Build and push Docker image
uses: docker/build-push-action@v5
with:
context: ./frontend
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache-dev
cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache-dev,mode=max

build-and-push-test-image-backend:
runs-on: ubuntu-latest
permissions:
Expand Down Expand Up @@ -227,8 +143,8 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
# cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache
cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-proxy:buildcache,mode=max
cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-proxy:buildcache,mode=max

build-and-push-test-image-fhir:
runs-on: ubuntu-latest
permissions:
Expand Down Expand Up @@ -386,9 +302,7 @@ jobs:
cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache
cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache,mode=max


build-and-push-image-proxy:
needs: [run-e2e-qa]
runs-on: ubuntu-latest
permissions:
contents: read
Expand Down Expand Up @@ -427,10 +341,9 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-proxy:buildcache
cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-proxy:buildcache,mode=max
cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-proxy:buildcache,mode=max

build-and-push-image-fhir:
needs: [run-e2e-qa]
runs-on: ubuntu-latest
permissions:
contents: read
Expand Down
120 changes: 120 additions & 0 deletions .github/workflows/publish-dev-backend-images.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Publish Dev Docker Images - Backend

on:
push:
branches: [develop]
release:
types: [published]
workflow_dispatch:

env:
REGISTRY: docker.io
IMAGE_NAME: ${{ github.repository }}
DOCKER_NAME: ${{ vars.DOCKERHUB_USERNAME }}/openelis-global-2

jobs:
build-and-push-image-backend-dev:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
platform:
- amd64
- arm64
permissions:
contents: read
packages: write
steps:
- name: Prepare
run: |
platform=linux/${{ matrix.platform }}
echo "PLATFORM_PAIR_BACKEND=${platform//\//-}" >> $GITHUB_ENV
- name: Checkout repository
uses: actions/checkout@v4
with:
submodules: recursive
# Add support for more platforms with QEMU (optional)
# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ vars.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.DOCKER_NAME }}-dev
- name: Build and push Docker image
id: build
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile.dev
# push: true
platforms: linux/${{ matrix.platform }}
# tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=registry,ref=${{ env.DOCKER_NAME }}-dev:${{ matrix.platform }}-buildcache-dev
cache-to: type=registry,ref=${{ env.DOCKER_NAME }}-dev:${{ matrix.platform }}-buildcache-dev,mode=max
build-args: SKIP_SPOTLESS=true
outputs: type=image,name=${{ env.DOCKER_NAME }}-dev,push-by-digest=true,name-canonical=true,push=true
- name: Export digest
run: |
mkdir -p /tmp/digests/backend
digest="${{ steps.build.outputs.digest }}"
touch "/tmp/digests/backend/${digest#sha256:}"
- name: Upload digest
uses: actions/upload-artifact@v4
with:
name: digests-${{ env.PLATFORM_PAIR_BACKEND }}-backend
path: /tmp/digests/backend/*
if-no-files-found: error
retention-days: 1

merge-backend-dev-platform-images:
runs-on: ubuntu-latest
needs:
- build-and-push-image-backend-dev
steps:
- name: Download digests
uses: actions/download-artifact@v4
with:
path: /tmp/digests/backend
pattern: digests-*
merge-multiple: true

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.DOCKER_NAME }}-dev

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ vars.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Create manifest list and push
working-directory: /tmp/digests/backend
run: |
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
$(printf '${{ env.DOCKER_NAME }}-dev@sha256:%s ' *)
- name: Inspect image
run: |
docker buildx imagetools inspect ${{ env.DOCKER_NAME }}-dev:${{ steps.meta.outputs.version }}
122 changes: 122 additions & 0 deletions .github/workflows/publish-dev-frontend-images.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Publish Dev Docker Images - Frontend

on:
push:
branches: [develop]
release:
types: [published]
workflow_dispatch:

env:
REGISTRY: docker.io
IMAGE_NAME: ${{ github.repository }}
DOCKER_NAME: ${{ vars.DOCKERHUB_USERNAME }}/openelis-global-2

jobs:
build-and-push-image-frontend-dev:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
platform:
- amd64
- arm64
permissions:
contents: read
packages: write
steps:
- name: Prepare
run: |
platform=linux/${{ matrix.platform }}
echo "PLATFORM_PAIR_FRONTEND=${platform//\//-}" >> $GITHUB_ENV
- name: Checkout repository
uses: actions/checkout@v4

# Add support for more platforms with QEMU (optional)
# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ vars.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.DOCKER_NAME }}-frontend-dev

- name: Build and push Docker image
id: build
uses: docker/build-push-action@v5
with:
context: ./frontend
# push: true
platforms: linux/${{ matrix.platform }}
# tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=registry,ref=${{ env.DOCKER_NAME }}-frontend-dev:${{ matrix.platform }}-buildcache-dev
cache-to: type=registry,ref=${{ env.DOCKER_NAME }}-frontend-dev:${{ matrix.platform }}-buildcache-dev,mode=max
outputs: type=image,name=${{ env.DOCKER_NAME }}-frontend-dev,push-by-digest=true,name-canonical=true,push=true
- name: Export digest
run: |
mkdir -p /tmp/digests/frontend
digest="${{ steps.build.outputs.digest }}"
touch "/tmp/digests/frontend/${digest#sha256:}"
- name: Upload digest
uses: actions/upload-artifact@v4
with:
name: digests-${{ env.PLATFORM_PAIR_FRONTEND }}-frontend
path: /tmp/digests/frontend/*
if-no-files-found: error
retention-days: 1

merge-frontend-dev-platform-images:
runs-on: ubuntu-latest
needs:
- build-and-push-image-frontend-dev
steps:
- name: Download digests
uses: actions/download-artifact@v4
with:
path: /tmp/digests/frontend
pattern: digests-*
merge-multiple: true

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.DOCKER_NAME }}-frontend-dev

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ vars.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Create manifest list and push
working-directory: /tmp/digests/frontend
run: |
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
$(printf '${{ env.DOCKER_NAME }}-frontend-dev@sha256:%s ' *)
- name: Inspect image
run: |
docker buildx imagetools inspect ${{ env.DOCKER_NAME }}-frontend-dev:${{ steps.meta.outputs.version }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ src/main/resources/adminPassword.txt
/.apt_generated/
*/plugins/*.jar
Patient/*
volume/database/data/
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "plugins"]
path = plugins
url = https://github.com/openelisglobal/openelisglobal-plugins.git
url = https://github.com/I-TECH-UW/openelisglobal-plugins.git
[submodule "tools/Liquibase-Outdated"]
path = tools/Liquibase-Outdated
url = https://github.com/I-TECH-UW/Liquibase-Outdated.git
Expand Down
Loading

0 comments on commit 6ec7064

Please sign in to comment.