From 257e4ff3223aa7411b776c1580b966f40cc7ed9d Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 31 Oct 2024 20:28:08 +0100 Subject: [PATCH] chore: Improve build by re-using pre-built artifacts --- .github/workflows/ci.yml | 132 ++++++++++++++++++++++++++++++++++ .github/workflows/docker.yml | 133 ----------------------------------- docker/Dockerfile | 7 ++ 3 files changed, 139 insertions(+), 133 deletions(-) delete mode 100644 .github/workflows/docker.yml create mode 100644 docker/Dockerfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f114159..0d4bbdb1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,8 @@ on: branches: - main - ci/** + - docker_container + pull_request: branches: - main @@ -91,3 +93,133 @@ jobs: GITHUB_TOKEN: ${{ github.token }} with: asset_paths: '["./freqUI.zip"]' + + + docker: + needs: build + runs-on: ubuntu-latest + + permissions: + packages: write + + environment: + name: Production + strategy: + fail-fast: false + matrix: + platform: + - linux/amd64 + - linux/arm/v6 + - linux/arm/v7 + - linux/arm64 + + steps: + + - uses: actions/checkout@v4 + + - name: Prepare Platform_pair + run: | + platform=${{ matrix.platform }} + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + + - name: Download digests + uses: actions/download-artifact@v4 + with: + path: ./dist/ + # Use node-22 build. + name: freqUI-22 + + + - name: Build and push Docker image + id: build + uses: docker/build-push-action@v6 + with: + platforms: ${{ matrix.platform }} + context: . + file: ./docker/Dockerfile + tags: ${{ steps.meta.outputs.tags }} + outputs: type=image,name=freqtradeorg/frequi,push-by-digest=true,name-canonical=true,push=true + + + - name: Export digest + run: | + mkdir -p /tmp/digests + digest="${{ steps.build.outputs.digest }}" + touch "/tmp/digests/${digest#sha256:}" + + - name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: digests-${{ env.PLATFORM_PAIR }} + path: /tmp/digests/* + if-no-files-found: error + retention-days: 1 + + + + docker-merge: + runs-on: ubuntu-latest + needs: + - docker + environment: + name: Production + steps: + - name: Download digests + uses: actions/download-artifact@v4 + with: + path: /tmp/digests + pattern: digests-* + merge-multiple: true + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + # list of Docker images to use as base name for tags + images: | + freqtradeorg/frequi + ghcr.io/freqtrade/frequi + # generate Docker tags based on the following events/attributes + tags: | + type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }} + type=semver,pattern={{version}} + type=ref,event=branch + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Create manifest list and push + working-directory: /tmp/digests + run: | + docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) + + - name: Inspect image + run: | + docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml deleted file mode 100644 index dd29cd67..00000000 --- a/.github/workflows/docker.yml +++ /dev/null @@ -1,133 +0,0 @@ -name: Build and Publish Docker Container - -on: - push: - branches: - - main - - docker_container - release: - types: [published] - workflow_dispatch: - - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - build: - runs-on: ubuntu-latest - permissions: - packages: write - - environment: - name: Production - - strategy: - fail-fast: false - matrix: - platform: - - linux/amd64 - - linux/arm/v6 - - linux/arm/v7 - - linux/arm64 - - steps: - - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Prepare Platform_pair - run: | - platform=${{ matrix.platform }} - echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push Docker image - id: build - uses: docker/build-push-action@v6 - with: - platforms: ${{ matrix.platform }} - context: . - tags: ${{ steps.meta.outputs.tags }} - outputs: type=image,name=freqtradeorg/frequi,push-by-digest=true,name-canonical=true,push=true - - - name: Export digest - run: | - mkdir -p /tmp/digests - digest="${{ steps.build.outputs.digest }}" - touch "/tmp/digests/${digest#sha256:}" - - - name: Upload digest - uses: actions/upload-artifact@v4 - with: - name: digests-${{ env.PLATFORM_PAIR }} - path: /tmp/digests/* - if-no-files-found: error - retention-days: 1 - - - merge: - runs-on: ubuntu-latest - needs: - - build - environment: - name: Production - steps: - - name: Download digests - uses: actions/download-artifact@v4 - with: - path: /tmp/digests - pattern: digests-* - merge-multiple: true - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - # list of Docker images to use as base name for tags - images: | - freqtradeorg/frequi - ghcr.io/freqtrade/frequi - # generate Docker tags based on the following events/attributes - tags: | - type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }} - type=semver,pattern={{version}} - type=ref,event=branch - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Create manifest list and push - working-directory: /tmp/digests - run: | - docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) - - - name: Inspect image - run: | - docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 00000000..3a5d9afe --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,7 @@ +# Special docker file for pre-built images +FROM nginx:1.27.2-alpine + +COPY dist/ /etc/nginx/html +COPY nginx.conf /etc/nginx/nginx.conf +EXPOSE 80 +CMD ["nginx"]