From 603d79c09d51e5e9a85688e81dc1408394d1d36e Mon Sep 17 00:00:00 2001 From: Elias Schneider Date: Mon, 10 Oct 2022 17:59:02 +0200 Subject: [PATCH] chore: update docker configuration --- .../workflows/docker-image-backend.yml | 16 ++++++------ .github/workflows/docker-image-frontend.yml | 25 +++++++++++++++++++ docker-compose.yml | 6 ++--- 3 files changed, 35 insertions(+), 12 deletions(-) rename frontend/.github/workflows/docker-image.yml => .github/workflows/docker-image-backend.yml (60%) create mode 100644 .github/workflows/docker-image-frontend.yml diff --git a/frontend/.github/workflows/docker-image.yml b/.github/workflows/docker-image-backend.yml similarity index 60% rename from frontend/.github/workflows/docker-image.yml rename to .github/workflows/docker-image-backend.yml index 7eb0be95..0ecdc507 100644 --- a/frontend/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image-backend.yml @@ -1,9 +1,10 @@ -name: Docker Image CI +name: Create Docker Image for Backend on: - workflow_dispatch: push: branches: main + paths: + - 'backend/**' jobs: build: @@ -11,15 +12,14 @@ jobs: steps: - name: checkout code uses: actions/checkout@v2 - - name: install buildx - id: buildx - uses: crazy-max/ghaction-docker-buildx@v1 - with: - version: latest + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 - name: login to docker registry run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin - name: build the image run: | docker buildx build --push \ - --tag stonith404/pingvin-share:latest \ + --tag stonith404/pingvin-share-backend:latest \ --platform linux/amd64,linux/arm64 . diff --git a/.github/workflows/docker-image-frontend.yml b/.github/workflows/docker-image-frontend.yml new file mode 100644 index 00000000..d51d75da --- /dev/null +++ b/.github/workflows/docker-image-frontend.yml @@ -0,0 +1,25 @@ +name: Create Docker Image for Frontend + +on: + push: + branches: main + paths: + - 'frontend/**' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: checkout code + uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: login to docker registry + run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin + - name: build the image + run: | + docker buildx build --push \ + --tag stonith404/pingvin-share-frontend:latest \ + --platform linux/amd64,linux/arm64 . diff --git a/docker-compose.yml b/docker-compose.yml index ef1a887b..71df8ee7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: volumes: - pingvin-share-db:/var/lib/postgresql/data backend: - image: pingvin-share/backend + image: stonith404/pingvin-share-backend restart: unless-stopped environment: - POSTGRES_USER=${DB_USER} @@ -21,8 +21,6 @@ services: - ALLOW_REGISTRATION=${ALLOW_REGISTRATION} - MAX_FILE_SIZE=${MAX_FILE_SIZE} - JWT_SECRET=${JWT_SECRET} - ports: - - '8080:8080' depends_on: - db volumes: @@ -31,7 +29,7 @@ services: restart: unless-stopped ports: - '3000:3000' - image: pingvin-share/frontend + image: stonith404/pingvin-share-frontend environment: - SHOW_HOME_PAGE=${SHOW_HOME_PAGE} - ALLOW_REGISTRATION=${ALLOW_REGISTRATION}