From f5e2310309ce16943851d86b081238d7896cce55 Mon Sep 17 00:00:00 2001 From: tijcolem Date: Thu, 26 Dec 2024 09:46:38 -0700 Subject: [PATCH 1/9] add ci to build and test service containers --- .github/workflows/build_test_containers.yml | 96 +++++++++++++++++++++ ci/publish_to_docker.sh | 32 +++++++ ci/publish_to_github.sh | 29 +++++++ 3 files changed, 157 insertions(+) create mode 100644 .github/workflows/build_test_containers.yml create mode 100755 ci/publish_to_docker.sh create mode 100755 ci/publish_to_github.sh diff --git a/.github/workflows/build_test_containers.yml b/.github/workflows/build_test_containers.yml new file mode 100644 index 000000000..05af44d6f --- /dev/null +++ b/.github/workflows/build_test_containers.yml @@ -0,0 +1,96 @@ +name: Build, test and publish containers + +on: + pull_request: + branches: + - '*' + push: + branches: + - '*' + tags: + - '*' + +jobs: + + simulation-tests: + name: Build containers and run boptest simulation tests + runs-on: ubuntu-22.04 + timeout-minutes: 240 + env: + COMPOSE_PROJECT_NAME: boptest_service + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Install Python + uses: actions/setup-python@v2 + with: + python-version: "3.9" + + - name: Build and run stack + run: | + cd service + docker compose build + docker compose up -d web worker + + - name: dump docker logs + uses: jwalton/gh-docker-logs@v1 + + - name: Upload test cases to minio + run: | + # The provision script will wait for the web service to be available, + # so there is no need for an external wait-for-it script + cd service + docker compose run --no-deps provision + curl http://localhost/testcases + + - name: Run example + run: | + cd service + python --version + pip install requests matplotlib numpy pandas + PYTHONPATH=$GITHUB_WORKSPACE + echo "PYTHONPATH=$PYTHONPATH" >> $GITHUB_ENV + # Storing PYTHONPATH above doesn't work for python so setting it below at run + cd boptest && PYTHONPATH=$PWD python examples/python/testcase1.py + + - name: Run tests + run: | + cd service + docker compose run --no-deps test + + - name: Dump docker logs on failure + if: failure() + uses: jwalton/gh-docker-logs@v1 + +#------------------------- Push to GitHub registry (disabled) ----------------------------- +# +# - name: Log in to the GitHub container registry +# uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 +# with: +# registry: ghcr.io +# username: ${{ github.actor }} +# password: ${{ secrets.GH_REGISTRY }} + +# - name: Publish docker images to GitHub Registry +# if: | +# github.ref == 'refs/heads/develop' || +# contains(github.ref, 'refs/tags') +# shell: bash +# run: ci/publish_to_github.sh + +#------------------ Push to docker hub (disabled) ------------------------------------- + + - name: Log in to Docker Hub + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + username: ${{ secrets.DOCKER_USER }} + password: ${{ secrets.DOCKER_PASS }} + + - name: Publish docker images to Docker Hub + if: | + github.ref == 'refs/heads/develop' || + github.ref == 'refs/heads/experimental' || + contains(github.ref, 'refs/tags') + shell: bash + run: ci/publish_to_docker.sh diff --git a/ci/publish_to_docker.sh b/ci/publish_to_docker.sh new file mode 100755 index 000000000..02357d13a --- /dev/null +++ b/ci/publish_to_docker.sh @@ -0,0 +1,32 @@ +# load .env defines in root of repo +export $(egrep -v '^#' .env | xargs) +export WEB_REGISTRY_URI=boptest_service-web +export WORKER_REGISTRY_URI=boptest_service-worker +export DOCKER_HUB_WEB_REGISTRY_URI=nrel/boptest-web +export DOCKER_HUB_WORKER_REGISTRY_URI=nrel/boptest-worker + +if [[ "${GITHUB_REF}" == "refs/heads/develop" ]]; then + export VERSION_TAG="develop" + echo "The docker tag is set to: ${VERSION_TAG}" +elif [[ "${GITHUB_REF}" =~ ^refs/tags/v[0-9].* ]]; then + export VERSION_TAG="${GITHUB_REF/refs\/tags\//}" + echo "The docker tag is set to: ${VERSION_TAG}" +elif [[ "${GITHUB_REF}" == "refs/heads/experimental" ]]; then + export VERSION_TAG="experimental" + echo "The docker tag is set to: ${VERSION_TAG}" +fi + + if [[ "${VERSION_TAG}" == "develop" ]] || [[ "${VERSION_TAG}" =~ ^v[0-9].* ]] || [[ "${VERSION_TAG}" == "experimental" ]] ; then + + docker image ls + docker tag ${WEB_REGISTRY_URI}:latest ${DOCKER_HUB_WEB_REGISTRY_URI}:${VERSION_TAG}; (( exit_status = exit_status || $? )) + docker tag ${WORKER_REGISTRY_URI}:latest ${DOCKER_HUB_WORKER_REGISTRY_URI}:${VERSION_TAG}; (( exit_status = exit_status || $? )) + + echo "pushing ${DOCKER_HUB_WEB_REGISTRY_URI}:${VERSION_TAG}" + docker push ${DOCKER_HUB_WEB_REGISTRY_URI}:${VERSION_TAG}; (( exit_status = exit_status || $? )) + echo "pushing ${DOCKER_HUB_WORKER_REGISTRY_URI}:${VERSION_TAG}" + docker push ${DOCKER_HUB_WORKER_REGISTRY_URI}:${VERSION_TAG}; (( exit_status = exit_status || $? )) + +fi + +exit $exit_status diff --git a/ci/publish_to_github.sh b/ci/publish_to_github.sh new file mode 100755 index 000000000..9a9bea218 --- /dev/null +++ b/ci/publish_to_github.sh @@ -0,0 +1,29 @@ +# load .env defines in root of repo +export $(egrep -v '^#' .env | xargs) +export GITHUB_WEB_REGISTRY_URI=ghcr.io/NREL/boptest-web +export GITHUB_WORKER_REGISTRY_URI=ghcr.io/NREL/boptest-worker + +if [[ "${GITHUB_REF}" == "refs/heads/develop" ]]; then + export VERSION_TAG="develop" + echo "The docker tag is set to: ${VERSION_TAG}" +elif [[ "${GITHUB_REF}" =~ ^refs/tags/v[0-9].* ]]; then + export VERSION_TAG="${GITHUB_REF/refs\/tags\//}" + echo "The docker tag is set to: ${VERSION_TAG}" +# use conditional below if you want to build a custom branch +# elif [[] "${GITHUB_REF}" == "refs/heads/boptest-service-custom" ]]; then +# export VERSION_TAG="experimental" +fi + + if [[ "${VERSION_TAG}" == "develop" ]] || [[ "${VERSION_TAG}" =~ ^v[0-9].* ]] || [[ "${VERSION_TAG}" == "experimental" ]] ; then + + docker tag ${WEB_REGISTRY_URI}:latest ${GITHUB_WEB_REGISTRY_URI}:${VERSION_TAG}; (( exit_status = exit_status || $? )) + docker tag ${WORKER_REGISTRY_URI}:latest ${GITHUB_WORKER_REGISTRY_URI}:${VERSION_TAG}; (( exit_status = exit_status || $? )) + + echo "pushing ${GITHUB_WEB_REGISTRY_URI}:${VERSION_TAG}" + docker push ${GITHUB_WEB_REGISTRY_URI}:${VERSION_TAG}; (( exit_status = exit_status || $? )) + echo "pushing ${GITHUB_WORKER_REGISTRY_URI}:${VERSION_TAG}" + docker push ${GITHUB_WORKER_REGISTRY_URI}:${VERSION_TAG}; (( exit_status = exit_status || $? )) + +fi + +exit $exit_status From 11dc6ef8bba5656b78c1f64064d7ade37f0b1bf8 Mon Sep 17 00:00:00 2001 From: tijcolem Date: Thu, 26 Dec 2024 10:00:01 -0700 Subject: [PATCH 2/9] update ci for new repodir structure --- .github/workflows/build_test_containers.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_test_containers.yml b/.github/workflows/build_test_containers.yml index 05af44d6f..aad56431c 100644 --- a/.github/workflows/build_test_containers.yml +++ b/.github/workflows/build_test_containers.yml @@ -46,13 +46,12 @@ jobs: - name: Run example run: | - cd service python --version pip install requests matplotlib numpy pandas PYTHONPATH=$GITHUB_WORKSPACE echo "PYTHONPATH=$PYTHONPATH" >> $GITHUB_ENV # Storing PYTHONPATH above doesn't work for python so setting it below at run - cd boptest && PYTHONPATH=$PWD python examples/python/testcase1.py + PYTHONPATH=$PWD python examples/python/testcase1.py - name: Run tests run: | From 38eaa0ad6e8b5b192c0b01b035b1b0e5555ef70c Mon Sep 17 00:00:00 2001 From: tijcolem Date: Thu, 26 Dec 2024 10:22:01 -0700 Subject: [PATCH 3/9] service already had cifolder scripts --- .github/workflows/build_test_containers.yml | 2 +- ci/publish_to_docker.sh | 32 --------------------- ci/publish_to_github.sh | 29 ------------------- 3 files changed, 1 insertion(+), 62 deletions(-) delete mode 100755 ci/publish_to_docker.sh delete mode 100755 ci/publish_to_github.sh diff --git a/.github/workflows/build_test_containers.yml b/.github/workflows/build_test_containers.yml index aad56431c..2b44563f6 100644 --- a/.github/workflows/build_test_containers.yml +++ b/.github/workflows/build_test_containers.yml @@ -92,4 +92,4 @@ jobs: github.ref == 'refs/heads/experimental' || contains(github.ref, 'refs/tags') shell: bash - run: ci/publish_to_docker.sh + run: service/ci/publish_to_docker.sh diff --git a/ci/publish_to_docker.sh b/ci/publish_to_docker.sh deleted file mode 100755 index 02357d13a..000000000 --- a/ci/publish_to_docker.sh +++ /dev/null @@ -1,32 +0,0 @@ -# load .env defines in root of repo -export $(egrep -v '^#' .env | xargs) -export WEB_REGISTRY_URI=boptest_service-web -export WORKER_REGISTRY_URI=boptest_service-worker -export DOCKER_HUB_WEB_REGISTRY_URI=nrel/boptest-web -export DOCKER_HUB_WORKER_REGISTRY_URI=nrel/boptest-worker - -if [[ "${GITHUB_REF}" == "refs/heads/develop" ]]; then - export VERSION_TAG="develop" - echo "The docker tag is set to: ${VERSION_TAG}" -elif [[ "${GITHUB_REF}" =~ ^refs/tags/v[0-9].* ]]; then - export VERSION_TAG="${GITHUB_REF/refs\/tags\//}" - echo "The docker tag is set to: ${VERSION_TAG}" -elif [[ "${GITHUB_REF}" == "refs/heads/experimental" ]]; then - export VERSION_TAG="experimental" - echo "The docker tag is set to: ${VERSION_TAG}" -fi - - if [[ "${VERSION_TAG}" == "develop" ]] || [[ "${VERSION_TAG}" =~ ^v[0-9].* ]] || [[ "${VERSION_TAG}" == "experimental" ]] ; then - - docker image ls - docker tag ${WEB_REGISTRY_URI}:latest ${DOCKER_HUB_WEB_REGISTRY_URI}:${VERSION_TAG}; (( exit_status = exit_status || $? )) - docker tag ${WORKER_REGISTRY_URI}:latest ${DOCKER_HUB_WORKER_REGISTRY_URI}:${VERSION_TAG}; (( exit_status = exit_status || $? )) - - echo "pushing ${DOCKER_HUB_WEB_REGISTRY_URI}:${VERSION_TAG}" - docker push ${DOCKER_HUB_WEB_REGISTRY_URI}:${VERSION_TAG}; (( exit_status = exit_status || $? )) - echo "pushing ${DOCKER_HUB_WORKER_REGISTRY_URI}:${VERSION_TAG}" - docker push ${DOCKER_HUB_WORKER_REGISTRY_URI}:${VERSION_TAG}; (( exit_status = exit_status || $? )) - -fi - -exit $exit_status diff --git a/ci/publish_to_github.sh b/ci/publish_to_github.sh deleted file mode 100755 index 9a9bea218..000000000 --- a/ci/publish_to_github.sh +++ /dev/null @@ -1,29 +0,0 @@ -# load .env defines in root of repo -export $(egrep -v '^#' .env | xargs) -export GITHUB_WEB_REGISTRY_URI=ghcr.io/NREL/boptest-web -export GITHUB_WORKER_REGISTRY_URI=ghcr.io/NREL/boptest-worker - -if [[ "${GITHUB_REF}" == "refs/heads/develop" ]]; then - export VERSION_TAG="develop" - echo "The docker tag is set to: ${VERSION_TAG}" -elif [[ "${GITHUB_REF}" =~ ^refs/tags/v[0-9].* ]]; then - export VERSION_TAG="${GITHUB_REF/refs\/tags\//}" - echo "The docker tag is set to: ${VERSION_TAG}" -# use conditional below if you want to build a custom branch -# elif [[] "${GITHUB_REF}" == "refs/heads/boptest-service-custom" ]]; then -# export VERSION_TAG="experimental" -fi - - if [[ "${VERSION_TAG}" == "develop" ]] || [[ "${VERSION_TAG}" =~ ^v[0-9].* ]] || [[ "${VERSION_TAG}" == "experimental" ]] ; then - - docker tag ${WEB_REGISTRY_URI}:latest ${GITHUB_WEB_REGISTRY_URI}:${VERSION_TAG}; (( exit_status = exit_status || $? )) - docker tag ${WORKER_REGISTRY_URI}:latest ${GITHUB_WORKER_REGISTRY_URI}:${VERSION_TAG}; (( exit_status = exit_status || $? )) - - echo "pushing ${GITHUB_WEB_REGISTRY_URI}:${VERSION_TAG}" - docker push ${GITHUB_WEB_REGISTRY_URI}:${VERSION_TAG}; (( exit_status = exit_status || $? )) - echo "pushing ${GITHUB_WORKER_REGISTRY_URI}:${VERSION_TAG}" - docker push ${GITHUB_WORKER_REGISTRY_URI}:${VERSION_TAG}; (( exit_status = exit_status || $? )) - -fi - -exit $exit_status From 4a1efe872784274c201bf54b738aefaa35c828f1 Mon Sep 17 00:00:00 2001 From: tijcolem Date: Thu, 26 Dec 2024 11:15:20 -0700 Subject: [PATCH 4/9] tags that have appended -service will be pushed to docker hub and/or github registry --- service/ci/publish_to_docker.sh | 2 +- service/ci/publish_to_github.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/service/ci/publish_to_docker.sh b/service/ci/publish_to_docker.sh index 02357d13a..8e6a7fa1c 100755 --- a/service/ci/publish_to_docker.sh +++ b/service/ci/publish_to_docker.sh @@ -8,7 +8,7 @@ export DOCKER_HUB_WORKER_REGISTRY_URI=nrel/boptest-worker if [[ "${GITHUB_REF}" == "refs/heads/develop" ]]; then export VERSION_TAG="develop" echo "The docker tag is set to: ${VERSION_TAG}" -elif [[ "${GITHUB_REF}" =~ ^refs/tags/v[0-9].* ]]; then +elif [[ "${GITHUB_REF}" =~ ^refs/tags/v[0-9].*-service ]]; then export VERSION_TAG="${GITHUB_REF/refs\/tags\//}" echo "The docker tag is set to: ${VERSION_TAG}" elif [[ "${GITHUB_REF}" == "refs/heads/experimental" ]]; then diff --git a/service/ci/publish_to_github.sh b/service/ci/publish_to_github.sh index 792db8ea9..6e54782a5 100755 --- a/service/ci/publish_to_github.sh +++ b/service/ci/publish_to_github.sh @@ -6,7 +6,7 @@ export GITHUB_WORKER_REGISTRY_URI=ghcr.io/NREL/boptest-worker if [[ "${GITHUB_REF}" == "refs/heads/develop" ]]; then export VERSION_TAG="develop" echo "The docker tag is set to: ${VERSION_TAG}" -elif [[ "${GITHUB_REF}" =~ ^refs/tags/v[0-9].* ]]; then +elif [[ "${GITHUB_REF}" =~ ^refs/tags/v[0-9].*-service ]]; then export VERSION_TAG="${GITHUB_REF/refs\/tags\//}" echo "The docker tag is set to: ${VERSION_TAG}" # use conditional below if you want to build a custom branch From 28a365b93638e0bfdf47a6d6c0130ae6e7cbcf6a Mon Sep 17 00:00:00 2001 From: tijcolem Date: Fri, 10 Jan 2025 10:01:20 -0700 Subject: [PATCH 5/9] Changing docker registry from docker hub to github projects Cleanup exisiting bash scripts For tags no longer using "-service" and just using the boptest tag name for both boptest library and the web and worker images. --- .github/workflows/build_test_containers.yml | 46 ++++++++++----------- service/ci/publish_to_docker.sh | 7 ++-- service/ci/publish_to_github.sh | 16 ++++--- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build_test_containers.yml b/.github/workflows/build_test_containers.yml index 2b44563f6..0302c198c 100644 --- a/.github/workflows/build_test_containers.yml +++ b/.github/workflows/build_test_containers.yml @@ -63,33 +63,33 @@ jobs: uses: jwalton/gh-docker-logs@v1 #------------------------- Push to GitHub registry (disabled) ----------------------------- -# -# - name: Log in to the GitHub container registry -# uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 -# with: -# registry: ghcr.io -# username: ${{ github.actor }} -# password: ${{ secrets.GH_REGISTRY }} - -# - name: Publish docker images to GitHub Registry -# if: | -# github.ref == 'refs/heads/develop' || -# contains(github.ref, 'refs/tags') -# shell: bash -# run: ci/publish_to_github.sh -#------------------ Push to docker hub (disabled) ------------------------------------- - - - name: Log in to Docker Hub + - name: Log in to the GitHub container registry uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 with: - username: ${{ secrets.DOCKER_USER }} - password: ${{ secrets.DOCKER_PASS }} - - - name: Publish docker images to Docker Hub + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GH_REGISTRY }} + + - name: Publish docker images to GitHub Registry if: | github.ref == 'refs/heads/develop' || - github.ref == 'refs/heads/experimental' || contains(github.ref, 'refs/tags') shell: bash - run: service/ci/publish_to_docker.sh + run: ci/publish_to_github.sh + +#------------------ Push to docker hub (disabled) ------------------------------------- +# +# - name: Log in to Docker Hub +# uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 +# with: +# username: ${{ secrets.DOCKER_USER }} +# password: ${{ secrets.DOCKER_PASS }} +# +# - name: Publish docker images to Docker Hub +# if: | +# github.ref == 'refs/heads/develop' || +# github.ref == 'refs/heads/experimental' || +# contains(github.ref, 'refs/tags') +# shell: bash +# run: service/ci/publish_to_docker.sh diff --git a/service/ci/publish_to_docker.sh b/service/ci/publish_to_docker.sh index 8e6a7fa1c..62ab3d998 100755 --- a/service/ci/publish_to_docker.sh +++ b/service/ci/publish_to_docker.sh @@ -2,13 +2,14 @@ export $(egrep -v '^#' .env | xargs) export WEB_REGISTRY_URI=boptest_service-web export WORKER_REGISTRY_URI=boptest_service-worker -export DOCKER_HUB_WEB_REGISTRY_URI=nrel/boptest-web -export DOCKER_HUB_WORKER_REGISTRY_URI=nrel/boptest-worker +export GITHUB_ORG=tijcolem +export DOCKER_HUB_WEB_REGISTRY_URI=$GITHUB_ORG/boptest-web +export DOCKER_HUB_WORKER_REGISTRY_URI=$GITHUB_ORG/boptest-worker if [[ "${GITHUB_REF}" == "refs/heads/develop" ]]; then export VERSION_TAG="develop" echo "The docker tag is set to: ${VERSION_TAG}" -elif [[ "${GITHUB_REF}" =~ ^refs/tags/v[0-9].*-service ]]; then +elif [[ "${GITHUB_REF}" =~ ^refs/tags/v[0-9].* ]]; then export VERSION_TAG="${GITHUB_REF/refs\/tags\//}" echo "The docker tag is set to: ${VERSION_TAG}" elif [[ "${GITHUB_REF}" == "refs/heads/experimental" ]]; then diff --git a/service/ci/publish_to_github.sh b/service/ci/publish_to_github.sh index 6e54782a5..598c1d3db 100755 --- a/service/ci/publish_to_github.sh +++ b/service/ci/publish_to_github.sh @@ -1,17 +1,21 @@ # load .env defines in root of repo export $(egrep -v '^#' .env | xargs) -export GITHUB_WEB_REGISTRY_URI=ghcr.io/NREL/boptest-web -export GITHUB_WORKER_REGISTRY_URI=ghcr.io/NREL/boptest-worker +export WEB_REGISTRY_URI=boptest_service-web +export WORKER_REGISTRY_URI=boptest_service-worker +export GITHUB_ORG=tijcolem +export GITHUB_WEB_REGISTRY_URI=ghcr.io/$GITHUB_ORG/boptest-web +export GITHUB_WORKER_REGISTRY_URI=ghcr.io/$GITHUB_ORG/boptest-worker + if [[ "${GITHUB_REF}" == "refs/heads/develop" ]]; then export VERSION_TAG="develop" echo "The docker tag is set to: ${VERSION_TAG}" -elif [[ "${GITHUB_REF}" =~ ^refs/tags/v[0-9].*-service ]]; then +elif [[ "${GITHUB_REF}" =~ ^refs/tags/v[0-9].* ]]; then export VERSION_TAG="${GITHUB_REF/refs\/tags\//}" echo "The docker tag is set to: ${VERSION_TAG}" -# use conditional below if you want to build a custom branch -# elif [[] "${GITHUB_REF}" == "refs/heads/boptest-service-custom" ]]; then -# export VERSION_TAG="experimental" +elif [[ "${GITHUB_REF}" == "refs/heads/experimental" ]]; then + export VERSION_TAG="experimental" + echo "The docker tag is set to: ${VERSION_TAG}" fi if [[ "${VERSION_TAG}" == "develop" ]] || [[ "${VERSION_TAG}" =~ ^v[0-9].* ]] || [[ "${VERSION_TAG}" == "experimental" ]] ; then From 2f2bace998267a511c1a5cabe978599168949ee4 Mon Sep 17 00:00:00 2001 From: tijcolem Date: Fri, 10 Jan 2025 10:49:48 -0700 Subject: [PATCH 6/9] fix broken path --- .github/workflows/build_test_containers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test_containers.yml b/.github/workflows/build_test_containers.yml index 0302c198c..b4fd13444 100644 --- a/.github/workflows/build_test_containers.yml +++ b/.github/workflows/build_test_containers.yml @@ -76,7 +76,7 @@ jobs: github.ref == 'refs/heads/develop' || contains(github.ref, 'refs/tags') shell: bash - run: ci/publish_to_github.sh + run: service/ci/publish_to_github.sh #------------------ Push to docker hub (disabled) ------------------------------------- # From eab8eea856d115abba4c0eb51ed5c2b968e69d01 Mon Sep 17 00:00:00 2001 From: tijcolem Date: Fri, 10 Jan 2025 12:05:04 -0700 Subject: [PATCH 7/9] clean up naming --- service/ci/publish_to_docker.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/ci/publish_to_docker.sh b/service/ci/publish_to_docker.sh index 62ab3d998..9feac85fb 100755 --- a/service/ci/publish_to_docker.sh +++ b/service/ci/publish_to_docker.sh @@ -2,9 +2,9 @@ export $(egrep -v '^#' .env | xargs) export WEB_REGISTRY_URI=boptest_service-web export WORKER_REGISTRY_URI=boptest_service-worker -export GITHUB_ORG=tijcolem -export DOCKER_HUB_WEB_REGISTRY_URI=$GITHUB_ORG/boptest-web -export DOCKER_HUB_WORKER_REGISTRY_URI=$GITHUB_ORG/boptest-worker +export DOCKER_ORG=nrel +export DOCKER_HUB_WEB_REGISTRY_URI=$DOCKER_ORG/boptest-web +export DOCKER_HUB_WORKER_REGISTRY_URI=$DOCKER_ORG/boptest-worker if [[ "${GITHUB_REF}" == "refs/heads/develop" ]]; then export VERSION_TAG="develop" From 181b63025012a1be603f4d282c915d24c4fdd2bc Mon Sep 17 00:00:00 2001 From: tijcolem Date: Mon, 13 Jan 2025 15:50:09 -0700 Subject: [PATCH 8/9] fix github org name and remove comment line --- .github/workflows/build_test_containers.yml | 2 -- service/ci/publish_to_github.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build_test_containers.yml b/.github/workflows/build_test_containers.yml index b4fd13444..8b9fc0067 100644 --- a/.github/workflows/build_test_containers.yml +++ b/.github/workflows/build_test_containers.yml @@ -62,8 +62,6 @@ jobs: if: failure() uses: jwalton/gh-docker-logs@v1 -#------------------------- Push to GitHub registry (disabled) ----------------------------- - - name: Log in to the GitHub container registry uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 with: diff --git a/service/ci/publish_to_github.sh b/service/ci/publish_to_github.sh index 598c1d3db..81abcbf47 100755 --- a/service/ci/publish_to_github.sh +++ b/service/ci/publish_to_github.sh @@ -2,7 +2,7 @@ export $(egrep -v '^#' .env | xargs) export WEB_REGISTRY_URI=boptest_service-web export WORKER_REGISTRY_URI=boptest_service-worker -export GITHUB_ORG=tijcolem +export GITHUB_ORG=ibpsa export GITHUB_WEB_REGISTRY_URI=ghcr.io/$GITHUB_ORG/boptest-web export GITHUB_WORKER_REGISTRY_URI=ghcr.io/$GITHUB_ORG/boptest-worker From c4df024f32d40e1088722510bb51a9a13f59b2fe Mon Sep 17 00:00:00 2001 From: tijcolem Date: Tue, 14 Jan 2025 11:22:19 -0700 Subject: [PATCH 9/9] use github username defined as github secret vs github.actor --- .github/workflows/build_test_containers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test_containers.yml b/.github/workflows/build_test_containers.yml index 8b9fc0067..a9bebe20c 100644 --- a/.github/workflows/build_test_containers.yml +++ b/.github/workflows/build_test_containers.yml @@ -66,7 +66,7 @@ jobs: uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 with: registry: ghcr.io - username: ${{ github.actor }} + username: ${{ secrets.GH_USERNAME }} password: ${{ secrets.GH_REGISTRY }} - name: Publish docker images to GitHub Registry