From e0d8df94a81b4d4df7986e9eda2e22b5a25506de Mon Sep 17 00:00:00 2001 From: Hironsan Date: Fri, 9 Sep 2022 15:02:15 +0900 Subject: [PATCH 1/2] Update workflow to build frontend and backend images --- .github/workflows/publish-image.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml index 0ed945c7..44562185 100644 --- a/.github/workflows/publish-image.yml +++ b/.github/workflows/publish-image.yml @@ -45,3 +45,21 @@ jobs: push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.docker_meta.outputs.tags }} labels: ${{ steps.docker_meta.outputs.labels }} + + - name: Build a backend image and push + uses: docker/build-push-action@v3 + with: + context: . + file: ./docker/Dockerfile.prod + push: ${{ github.event_name != 'pull_request' }} + tags: doccano/doccano:backend + labels: ${{ steps.docker_meta.outputs.labels }} + + - name: Build a frontend image and push + uses: docker/build-push-action@v3 + with: + context: . + file: ./docker/Dockerfile.nginx + push: ${{ github.event_name != 'pull_request' }} + tags: doccano/doccano:frontend + labels: ${{ steps.docker_meta.outputs.labels }} From 9259a71403459020583d4900c167514dba4535d6 Mon Sep 17 00:00:00 2001 From: Hironsan Date: Fri, 9 Sep 2022 16:52:58 +0900 Subject: [PATCH 2/2] Use pre-built image to avoid build --- docker/docker-compose.prod.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml index bce0b950..317c797f 100644 --- a/docker/docker-compose.prod.yml +++ b/docker/docker-compose.prod.yml @@ -2,10 +2,7 @@ version: "3.7" services: backend: - build: - context: .. - dockerfile: docker/Dockerfile.prod - image: doccano_backend:prod + image: doccano/doccano:backend volumes: - static_volume:/backend/staticfiles - media:/backend/media @@ -26,10 +23,7 @@ services: - network-frontend celery: - build: - context: .. - dockerfile: docker/Dockerfile.prod - image: doccano_celery:prod + image: doccano/doccano:backend volumes: - media:/backend/media - tmp_file:/backend/filepond-temp-uploads @@ -46,10 +40,7 @@ services: - network-backend flower: - build: - context: .. - dockerfile: docker/Dockerfile.prod - image: doccano_flower:prod + image: doccano/doccano:backend entrypoint: ["/opt/bin/prod-flower.sh"] environment: PYTHONUNBUFFERED: "1" @@ -76,10 +67,7 @@ services: - network-backend nginx: - build: - context: .. - dockerfile: docker/Dockerfile.nginx - image: doccano_nginx:prod + image: doccano/doccano:frontend command: > /bin/sh -c "envsubst '