From 12e43005540d627cd2c5693872f171e929e324dd Mon Sep 17 00:00:00 2001 From: jonandernovella Date: Thu, 14 Sep 2023 10:46:40 +0200 Subject: [PATCH 1/3] chore: add email env vars and bump submodules --- backend-wsgi-server.env.example | 7 +++++++ mimir-server | 2 +- mimir-ui | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/backend-wsgi-server.env.example b/backend-wsgi-server.env.example index 6aeb0f5..7533519 100644 --- a/backend-wsgi-server.env.example +++ b/backend-wsgi-server.env.example @@ -7,3 +7,10 @@ DJANGO_SUPERUSER_USERNAME=mimir DJANGO_SUPERUSER_PASSWORD=mimirum DJANGO_SUPERUSER_EMAIL=mimir@example.com ACCOUNT_EMAIL_VERIFICATION=none +ACCOUNT_EMAIL_REQUIRED=False +EMAIL_HOST=smtp +EMAIL_PORT=8025 +EMAIL_HOST_USER=userone +EMAIL_HOST_PASSWORD=passwordone +EMAIL_USE_TLS=True +EMAIL_FROM=webmaster@mimir-test.nbis.se diff --git a/mimir-server b/mimir-server index 5e3b661..c61db4f 160000 --- a/mimir-server +++ b/mimir-server @@ -1 +1 @@ -Subproject commit 5e3b661e2c6f72246147e32b710885797f9ad47c +Subproject commit c61db4f57a8db3f39c580caeed520265b6c63085 diff --git a/mimir-ui b/mimir-ui index 710ddb9..cf40d06 160000 --- a/mimir-ui +++ b/mimir-ui @@ -1 +1 @@ -Subproject commit 710ddb9c640196d088f42140cfab81ce8732eb0b +Subproject commit cf40d064ce8c9c7db69b11783f1678c9fd42e32b From 68d8574a86c993872f46594017e952f85b9bdd92 Mon Sep 17 00:00:00 2001 From: jonandernovella Date: Mon, 18 Sep 2023 15:12:44 +0200 Subject: [PATCH 2/3] chore: bump submodules --- mimir-server | 2 +- mimir-ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mimir-server b/mimir-server index c61db4f..379a640 160000 --- a/mimir-server +++ b/mimir-server @@ -1 +1 @@ -Subproject commit c61db4f57a8db3f39c580caeed520265b6c63085 +Subproject commit 379a640068963b0c938a0142c22e59e77b8a417c diff --git a/mimir-ui b/mimir-ui index cf40d06..0fba94f 160000 --- a/mimir-ui +++ b/mimir-ui @@ -1 +1 @@ -Subproject commit cf40d064ce8c9c7db69b11783f1678c9fd42e32b +Subproject commit 0fba94fa85ccc7fa32e173a5e44dbc2c9116f6a4 From 60cc040aff0218df0fd1002ee5a4bc4688e6bb98 Mon Sep 17 00:00:00 2001 From: jonandernovella Date: Mon, 18 Sep 2023 15:13:13 +0200 Subject: [PATCH 3/3] feat: Add gh images publish workflow To publish the client and backend images. --- .github/workflows/publish.yml | 96 +++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..217aa62 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,96 @@ +name: Bump version +on: + push: + branches: + - develop + +jobs: + tag: + name: bump tags + outputs: + part: ${{ steps.bump_tag.outputs.part }} + tag: ${{ steps.bump_tag.outputs.tag }} + new_tag: ${{ steps.bump_tag.outputs.new_tag }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + submodules: true + - name: Bump version and push tag + id: bump_tag + uses: anothrNick/github-tag-action@1.67.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + WITH_V: true + DEFAULT_BUMP: patch + + push_to_registry: + needs: tag + if: needs.tag.outputs.part != '' + name: Push Docker image to Github Container registry + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - name: Check out the repo + uses: actions/checkout@v3 + with: + submodules: true + + - name: Log in to the Github Container registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v4 + with: + images: ghcr.io/nbisweden/mimir + + - name: Build and push client + uses: docker/build-push-action@v3 + with: + context: ./mimir-ui + file: ./mimir-ui/Dockerfile + push: true + tags: | + ghcr.io/nbisweden/mimir-client:${{ needs.tag.outputs.tag }} + ghcr.io/nbisweden/mimir-client:latest + labels: | + org.opencontainers.image.source=${{ github.event.repository.clone_url }} + org.opencontainers.image.created=$(date -u +'%Y-%m-%dT%H:%M:%SZ') + org.opencontainers.image.revision=${{ github.sha }} + + - name: Build and push backend-wsgi-server + uses: docker/build-push-action@v3 + with: + context: ./mimir-server + file: ./mimir-server/Dockerfile + target: wsgi-server + push: true + tags: | + ghcr.io/nbisweden/mimir-backend-wsgi-server:${{ needs.tag.outputs.tag }} + ghcr.io/nbisweden/mimir-backend-wsgi-server:latest + labels: | + org.opencontainers.image.source=${{ github.event.repository.clone_url }} + org.opencontainers.image.created=$(date -u +'%Y-%m-%dT%H:%M:%SZ') + org.opencontainers.image.revision=${{ github.sha }} + + - name: Build and push backend-web-server + uses: docker/build-push-action@v3 + with: + context: ./mimir-server + file: ./mimir-server/Dockerfile + push: true + tags: | + ghcr.io/nbisweden/mimir-backend-web-server:${{ needs.tag.outputs.tag }} + ghcr.io/nbisweden/mimir-backend-web-server:latest + labels: | + org.opencontainers.image.source=${{ github.event.repository.clone_url }} + org.opencontainers.image.created=$(date -u +'%Y-%m-%dT%H:%M:%SZ') + org.opencontainers.image.revision=${{ github.sha }}