From 016c8c802c5b70baf1cb4cd5fc1e70e7144ae997 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Thu, 10 Apr 2025 21:10:10 -0400 Subject: [PATCH] Finalize moving docker publish to GH actions (#8927) --- .github/workflows/ci.yml | 2 +- .github/workflows/docker.yml | 198 +++++++++++++++++++++++++++++++---- Dockerfile | 5 +- Dockerfile.base | 5 +- 4 files changed, 187 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff2eb0afcd..82f831b838 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ env: DATABASE_URL: postgres://postgres:password@localhost:5432/outline_test REDIS_URL: redis://127.0.0.1:6379 URL: http://localhost:3000 - NODE_OPTIONS: --max-old-space-size=8000 + NODE_OPTIONS: --max-old-space-size=8192 SECRET_KEY: F0E5AD933D7F6FD8F4DBB3E038C501C052DC0593C686D21ACB30AE205D2F634B UTILS_SECRET: 123456 SLACK_VERIFICATION_TOKEN: 123456 diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 0d58a68228..478a0aaaf9 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,25 +3,32 @@ name: Docker on: push: tags: - - 'v*' + - "v*" env: IMAGE_NAME: outlinewiki/outline BASE_IMAGE_NAME: outlinewiki/outline-base jobs: - build-and-push: - runs-on: ubuntu-latest + build-arm: + runs-on: ubicloud-standard-8-arm steps: - name: Checkout uses: actions/checkout@v4 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + - name: Docker base meta + id: base_meta + uses: docker/metadata-action@v5 + with: + images: | + ${{ env.BASE_IMAGE_NAME }} + tags: | + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + - name: Login to Docker Hub uses: docker/login-action@v3 with: @@ -29,24 +36,177 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push base image - uses: docker/build-push-action@v5 + id: base_build + uses: docker/build-push-action@v6 with: context: . file: Dockerfile.base - push: true - tags: ${{ env.BASE_IMAGE_NAME }}:latest - platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x + labels: ${{ steps.base_meta.outputs.labels }} + tags: ${{ env.BASE_IMAGE_NAME }} + outputs: type=image,push-by-digest=true,name-canonical=true,push=true + platforms: linux/arm64 + cache-from: type=gha + cache-to: type=gha,mode=max + pull: false - - name: Extract version - id: version - run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: | + ${{ env.IMAGE_NAME }} + tags: | + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} - - name: Build and push main image - uses: docker/build-push-action@v5 + - name: Build and push + id: build + uses: docker/build-push-action@v6 with: context: . - push: true - platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x + file: Dockerfile + labels: ${{ steps.meta.outputs.labels }} + tags: ${{ env.IMAGE_NAME }} + outputs: type=image,push-by-digest=true,name-canonical=true,push=true + platforms: linux/arm64 + cache-from: type=gha + cache-to: type=gha,mode=max + pull: false + build-args: | + BASE_IMAGE=${{ env.BASE_IMAGE_NAME }}@${{ steps.base_build.outputs.digest }} + + - name: Export digest + run: | + mkdir -p ${{ runner.temp }}/digests + digest="${{ steps.build.outputs.digest }}" + touch "${{ runner.temp }}/digests/${digest#sha256:}" + + - name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: digests-linux-arm64 + path: ${{ runner.temp }}/digests/* + if-no-files-found: error + retention-days: 1 + + build-amd: + runs-on: ubicloud-standard-8 + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Docker base meta + id: base_meta + uses: docker/metadata-action@v5 + with: + images: | + ${{ env.BASE_IMAGE_NAME }} tags: | - ${{ env.IMAGE_NAME }}:latest - ${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push base image + id: base_build + uses: docker/build-push-action@v6 + with: + context: . + file: Dockerfile.base + labels: ${{ steps.base_meta.outputs.labels }} + tags: ${{ env.BASE_IMAGE_NAME }} + outputs: type=image,push-by-digest=true,name-canonical=true,push=true + platforms: linux/amd64 + cache-from: type=gha + cache-to: type=gha,mode=max + pull: false + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: | + ${{ env.IMAGE_NAME }} + tags: | + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + + - name: Build and push + id: build + uses: docker/build-push-action@v6 + with: + context: . + file: Dockerfile + labels: ${{ steps.meta.outputs.labels }} + tags: ${{ env.IMAGE_NAME }} + outputs: type=image,push-by-digest=true,name-canonical=true,push=true + platforms: linux/amd64 + cache-from: type=gha + cache-to: type=gha,mode=max + pull: false + build-args: | + BASE_IMAGE=${{ env.BASE_IMAGE_NAME }}@${{ steps.base_build.outputs.digest }} + + - name: Export digest + run: | + mkdir -p ${{ runner.temp }}/digests + digest="${{ steps.build.outputs.digest }}" + touch "${{ runner.temp }}/digests/${digest#sha256:}" + + - name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: digests-linux-amd64 + path: ${{ runner.temp }}/digests/* + if-no-files-found: error + retention-days: 1 + + merge: + runs-on: ubicloud-standard-8 + needs: + - build-amd + - build-arm + steps: + - name: Download digests + uses: actions/download-artifact@v4 + with: + path: ${{ runner.temp }}/digests + pattern: digests-* + merge-multiple: true + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.IMAGE_NAME }} + tags: | + type=ref,event=branch + type=ref,event=pr + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + + - name: Create manifest list and push + working-directory: ${{ runner.temp }}/digests + run: | + docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf '${{ env.IMAGE_NAME }}@sha256:%s ' *) + + - name: Inspect image + run: | + docker buildx imagetools inspect ${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index a0393b6b93..fcc6d08168 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ ARG APP_PATH=/opt/outline -FROM outlinewiki/outline-base AS base +ARG BASE_IMAGE=outlinewiki/outline-base +FROM ${BASE_IMAGE} AS base ARG APP_PATH WORKDIR $APP_PATH @@ -30,7 +31,7 @@ RUN addgroup --gid 1001 nodejs && \ adduser --uid 1001 --ingroup nodejs nodejs && \ chown -R nodejs:nodejs $APP_PATH/build && \ mkdir -p /var/lib/outline && \ - chown -R nodejs:nodejs /var/lib/outline + chown -R nodejs:nodejs /var/lib/outline ENV FILE_STORAGE_LOCAL_ROOT_DIR=/var/lib/outline/data RUN mkdir -p "$FILE_STORAGE_LOCAL_ROOT_DIR" && \ diff --git a/Dockerfile.base b/Dockerfile.base index 13378f1caa..91f90f3c2a 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -1,11 +1,14 @@ ARG APP_PATH=/opt/outline -FROM node:20-slim AS deps +FROM node:20 AS deps ARG APP_PATH WORKDIR $APP_PATH COPY ./package.json ./yarn.lock ./ COPY ./patches ./patches +RUN apt-get update && apt-get install -y cmake +ENV NODE_OPTIONS="--max-old-space-size=24000" + RUN yarn install --no-optional --frozen-lockfile --network-timeout 1000000 && \ yarn cache clean