From 22ca66127bbcdf69dfbc049783344f9817ee7cdb Mon Sep 17 00:00:00 2001 From: Jack Amadeo Date: Tue, 12 Nov 2024 10:02:42 -0500 Subject: [PATCH 1/5] Add docker build --- .github/workflows/docker.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 0000000..b56a451 --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,30 @@ +name: build-docker + +on: + push: + branches: + - master + - build-docker # RM ME + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + 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 + uses: docker/build-push-action@v6 + with: + push: true + tags: neptyne/neptyne:latest From 9c90e04ec0677e9ba65d65a31029ab6302d64020 Mon Sep 17 00:00:00 2001 From: Jack Amadeo Date: Tue, 12 Nov 2024 10:40:53 -0500 Subject: [PATCH 2/5] Multi-arch --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b56a451..77896b2 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -26,5 +26,6 @@ jobs: name: Build and push uses: docker/build-push-action@v6 with: + platforms: linux/amd64,linux/arm64 push: true tags: neptyne/neptyne:latest From 28e9eabc1a09f941741de60711d3041f3ff80e09 Mon Sep 17 00:00:00 2001 From: Jack Amadeo Date: Tue, 12 Nov 2024 11:25:02 -0500 Subject: [PATCH 3/5] network-timeout --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dc608c8..3bc31a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN /root/.cargo/bin/uv pip install --no-cache -r requirements.txt FROM node:16 AS frontend WORKDIR /app COPY frontend/package.json frontend/yarn.lock ./frontend/ -RUN cd frontend && yarn install +RUN cd frontend && yarn install --network-timeout 500000 COPY frontend ./frontend RUN cd frontend && yarn build From 3f8dfb70902149d2f030ef2341811020f25900f7 Mon Sep 17 00:00:00 2001 From: Jack Amadeo Date: Tue, 12 Nov 2024 12:49:10 -0500 Subject: [PATCH 4/5] Try matrix --- .github/workflows/docker.yml | 97 +++++++++++++++++++++++++++++++----- 1 file changed, 84 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 77896b2..54f2063 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -6,26 +6,97 @@ on: - master - build-docker # RM ME +env: + REGISTRY_IMAGE: neptyne/neptyne + jobs: - docker: + build: runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + platform: + - linux/amd64 + - linux/arm64 steps: - - - name: Set up QEMU + - name: Prepare + run: | + platform=${{ matrix.platform }} + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY_IMAGE }} + + - name: Set up QEMU uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx + + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - - name: Login to Docker Hub + + - name: Login to Docker Hub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} + username: ${{ vars.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push + + - name: Build and push by digest + id: build uses: docker/build-push-action@v6 with: - platforms: linux/amd64,linux/arm64 - push: true - tags: neptyne/neptyne:latest + platforms: ${{ matrix.platform }} + labels: ${{ steps.meta.outputs.labels }} + outputs: type=image,name=${{ env.REGISTRY_IMAGE }},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 + 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: + images: ${{ env.REGISTRY_IMAGE }} + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ vars.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_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 }} From cc60cdb730f6a0851ac30885b5e3e5f38a98a4bd Mon Sep 17 00:00:00 2001 From: Jack Amadeo Date: Tue, 12 Nov 2024 12:50:47 -0500 Subject: [PATCH 5/5] s/var/secret --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 54f2063..dd7d9f6 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -39,7 +39,7 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - username: ${{ vars.DOCKERHUB_USERNAME }} + username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push by digest @@ -88,7 +88,7 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - username: ${{ vars.DOCKERHUB_USERNAME }} + username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Create manifest list and push