From 5284e302028434b0d6d96dff55a889744d558a15 Mon Sep 17 00:00:00 2001 From: Yannic Kilcher Date: Sat, 24 Dec 2022 23:55:20 +0100 Subject: [PATCH] improved release workflow --- .github/workflows/docker-build.yaml | 8 ++++++-- .github/workflows/release.yaml | 17 ++++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index 5697d5b0..2a8c2ff9 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -3,7 +3,10 @@ name: Build on: workflow_call: inputs: - folder: + dockerfile: + required: true + type: string + context: required: true type: string image-name: @@ -48,7 +51,8 @@ jobs: - name: Build and push Docker image uses: docker/build-push-action@v3.2.0 with: - context: ${{ inputs.folder }} + file: ${{ inputs.dockerfile }} + context: ${{ inputs.context }} build-args: ${{ inputs.build-args }} push: true tags: ${{ steps.meta.outputs.tags }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a7dd89c8..5132c6e9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,5 +9,20 @@ jobs: uses: ./.github/workflows/docker-build.yaml with: image-name: oasst-backend - folder: backend + context: . + dockerfile: docker/Dockerfile.backend + build-args: "" + build-web: + uses: ./.github/workflows/docker-build.yaml + with: + image-name: oasst-web + context: . + dockerfile: docker/Dockerfile.website + build-args: "" + build-bot: + uses: ./.github/workflows/docker-build.yaml + with: + image-name: oasst-discord-bot + context: . + dockerfile: docker/Dockerfile.discord-bot build-args: ""