Skip to content

Commit

Permalink
Merge pull request #38 from UCSF-IGHS/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
alaboso authored Jul 20, 2023
2 parents ed31a9c + 8cc0195 commit 8502bd7
Show file tree
Hide file tree
Showing 27 changed files with 2,686 additions and 1,917 deletions.
119 changes: 119 additions & 0 deletions .github/workflows/ohri-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
name: OHRI Dev with O3 Images

on:
push:
branches:
- dev
pull_request:
types: [opened, synchronize, closed]
env:
# Use docker.io for Docker Hub if empty
REGISTRY: ghcr.io
# github.repository as <account>/<repo>
IMAGE_NAME: ${{ github.repository }}

jobs:
docker_setup:
runs-on: ubuntu-latest
if: (github.event_name == 'push' || github.event.pull_request.merged)

steps:
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v3
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

docker_staging_backend:
runs-on: ubuntu-latest
needs: docker_setup

steps:
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Checkout
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Build and push
uses: docker/build-push-action@v4
with:
context: .
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ secrets.DOCKERHUB_USERNAME }}/ohri-dev-backend-2_6:next,${{ secrets.DOCKERHUB_USERNAME }}/ohri-dev-backend-2_6:ci_${{ github.run_number }}
cache-from: type=inline,ref=user/app:buildcache
cache-to: type=inline,ref=user/app:buildcache,mode=max

docker_staging_frontend:
runs-on: ubuntu-latest
needs: docker_setup

steps:
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Checkout
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Build and push
uses: docker/build-push-action@v4
with:
context: ./frontend
file: ./frontend/Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ secrets.DOCKERHUB_USERNAME }}/ohri-dev-frontend:next,${{ secrets.DOCKERHUB_USERNAME }}/ohri-dev-frontend:ci_${{ github.run_number }}
cache-from: type=inline,ref=user/app:buildcache
cache-to: type=inline,ref=user/app:buildcache,mode=max

docker_staging_gateway:
runs-on: ubuntu-latest
needs: docker_setup

steps:
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Checkout
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Build and push
id: build-and-push
uses: docker/build-push-action@v4
with:
context: ./gateway
file: ./gateway/Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ secrets.DOCKERHUB_USERNAME }}/ohri-dev-proxy:next,${{ secrets.DOCKERHUB_USERNAME }}/ohri-dev-proxy:ci_${{ github.run_number }}
cache-from: type=gha
cache-to: type=gha,mode=max
- name: Save image digest
run: echo "::set-output name=image::${{ steps.build-and-push.output.digest }}"
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@
}
],
"processor": "EncounterFormProcessor",
"uuid": "xxxx",
"uuid": "bbb35235-7c31-4606-9a70-5bbfdc8132fc",
"referencedForms": [],
"allowUnspecifiedAll": true
}
Original file line number Diff line number Diff line change
Expand Up @@ -1978,7 +1978,7 @@
"sections": [],
"isSubform": "true",
"subform": {
"name": "covid_lab_order",
"name": "COVID Lab Order Form",
"package": "covid",
"behaviours": [
{
Expand Down
4 changes: 2 additions & 2 deletions distro/configuration/ampathforms/covid_case_v1.0.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"sections": [],
"isSubform": "true",
"subform": {
"name": "covid_assessment",
"name": "COVID Assessment Form",
"package": "covid",
"behaviours": [
{
Expand All @@ -25,7 +25,7 @@
"sections": [],
"isSubform": "true",
"subform": {
"name": "covid_outcome",
"name": "COVID Outcome Form",
"package": "covid",
"behaviours": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"sections": [],
"isSubform": "true",
"subform": {
"name": "covid_lab_order",
"name": "COVID Lab Order Form",
"package": "covid",
"behaviours": [
{
Expand Down Expand Up @@ -212,7 +212,7 @@
}
],
"processor": "EncounterFormProcessor",
"uuid": "xxxx",
"uuid": "d38bc949-c95b-39eb-a2c5-08b82a36409c",
"referencedForms": [],
"encounterType": "a77d3e7f-5c8f-4074-a207-77a70e197b0c",
"encounter": "COVID Lab Encounter",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"sections": [],
"isSubform": "true",
"subform": {
"name": "covid_lab_order",
"name": "COVID Lab Order Form",
"package": "covid",
"behaviours": [
{
Expand Down
8 changes: 4 additions & 4 deletions distro/configuration/ampathforms/covid_lab_test_v1.0.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"sections": [],
"isSubform": "true",
"subform": {
"name": "covid_lab_order",
"name": "COVID Lab Order Form",
"package": "covid",
"behaviours": [
{
Expand All @@ -60,7 +60,7 @@
"sections": [],
"isSubform": "true",
"subform": {
"name": "covid_sample_collection",
"name": "Sample Collection",
"package": "covid",
"behaviours": [
{
Expand All @@ -76,7 +76,7 @@
"sections": [],
"isSubform": "true",
"subform": {
"name": "covid_lab_order_cancellation",
"name": "Lab Order Cancellation",
"package": "covid",
"behaviours": [
{
Expand All @@ -92,7 +92,7 @@
"sections": [],
"isSubform": "true",
"subform": {
"name": "covid_lab_result",
"name": "COVID Lab Result Form",
"package": "covid",
"behaviours": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
}
],
"processor": "EncounterFormProcessor",
"uuid": "xxxx",
"uuid": "d9bbee02-4f76-3e88-89b8-fb5b70d2cb2d",
"referencedForms": [],
"encounterType": "253a43d3-c99e-415c-8b78-ee7d4d3c1d54",
"encounter": "COVID Case Assessment",
Expand Down
2 changes: 1 addition & 1 deletion distro/configuration/ampathforms/covid_outcome_v1.0.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"sections": [],
"isSubform": "true",
"subform": {
"name": "covid_assessment",
"name": "COVID Assessment Form",
"package": "covid",
"behaviours": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
}
],
"processor": "EncounterFormProcessor",
"uuid": "xxxx",
"uuid": "a66197de-419a-3223-8691-f70d36b1524b",
"referencedForms": [],
"encounterType": "96adb28e-e417-43a3-8f7d-682f8af5e912",
"encounter": "CD4 Lab results",
Expand Down
4 changes: 2 additions & 2 deletions distro/configuration/ampathforms/ct_clinical_visit_v1.0.json
Original file line number Diff line number Diff line change
Expand Up @@ -8882,7 +8882,7 @@
"sections": [],
"isSubform": "true",
"subform": {
"name": "cd4_lab_results",
"name": "CD4 Lab Result",
"package": "hiv",
"behaviours": [
{
Expand All @@ -8898,7 +8898,7 @@
"sections": [],
"isSubform": "true",
"subform": {
"name": "viral_load_results",
"name": "Viral Load Lab Result",
"package": "hiv",
"behaviours": [
{
Expand Down
4 changes: 2 additions & 2 deletions distro/configuration/ampathforms/ct_clinical_visit_v2.0.json
Original file line number Diff line number Diff line change
Expand Up @@ -9075,7 +9075,7 @@
"sections": [],
"isSubform": "true",
"subform": {
"name": "cd4_lab_results",
"name": "CD4 Lab Result",
"package": "hiv",
"behaviours": [
{
Expand All @@ -9091,7 +9091,7 @@
"sections": [],
"isSubform": "true",
"subform": {
"name": "viral_load_results",
"name": "Viral Load Lab Result",
"package": "hiv",
"behaviours": [
{
Expand Down
2 changes: 1 addition & 1 deletion distro/configuration/ampathforms/ct_lab_results_v1.0.json
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@
}
],
"processor": "EncounterFormProcessor",
"uuid": "xxxx",
"uuid": "98621650-1e6c-3632-99e7-04afd1258d1e",
"referencedForms": [],
"encounterType": "15272be5-ae9c-4278-a303-4b8907eae73b",
"encounter": "HIV Lab Order and Results",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@
}
],
"processor": "EncounterFormProcessor",
"uuid": "xxxx",
"uuid": "717eed11-55bb-3adb-9be4-3e92efcea2c8",
"encounterType": "41af1931-184e-45f8-86ca-d42e0db0b8a1",
"encounter": "Viral Load results",
"referencedForms": []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@
}
],
"processor": "EncounterFormProcessor",
"uuid": "xxxx",
"uuid": "c9eb639e-b5d0-3ed3-a3c7-0dc48fc6acb6",
"referencedForms": [],
"encounterType": "41af1931-184e-45f8-86ca-d42e0db0b8a1",
"encounter": "Viral Load results",
Expand Down
Loading

0 comments on commit 8502bd7

Please sign in to comment.