From adc69e5b22d90fe440f4bff22fe5004aa12ad5f6 Mon Sep 17 00:00:00 2001 From: Kirill Ov Date: Wed, 24 Sep 2025 11:23:17 +0200 Subject: [PATCH 1/2] build docker containers for for arm64 too --- .github/workflows/build_latest_container.yml | 19 ++++++++++++------- .github/workflows/build_release_container.yml | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build_latest_container.yml b/.github/workflows/build_latest_container.yml index 671d765a..67a992e6 100644 --- a/.github/workflows/build_latest_container.yml +++ b/.github/workflows/build_latest_container.yml @@ -8,15 +8,20 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Build image - run: | - cd docker - docker build -t ghcr.io/coleifer/sqlite-web:latest . + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: registry: ghcr.io - username: ${{github.actor}} + username: ${{ github.repository_owner }} password: ${{secrets.GITHUB_TOKEN}} - - name: Upload latest container to registry - run: docker push ghcr.io/coleifer/sqlite-web:latest + - name: Build and push multi-arch images + uses: docker/build-push-action@v5 + with: + context: ./docker + platforms: linux/amd64,linux/arm64 + push: true + tags: ghcr.io/${{ github.repository_owner }}/sqlite-web:latest diff --git a/.github/workflows/build_release_container.yml b/.github/workflows/build_release_container.yml index 356c89ce..fbf7c5a0 100644 --- a/.github/workflows/build_release_container.yml +++ b/.github/workflows/build_release_container.yml @@ -8,15 +8,20 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Build image - run: | - cd docker - docker build -t ghcr.io/coleifer/sqlite-web:${{ github.ref_name }} . + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: registry: ghcr.io - username: ${{github.actor}} + username: ${{ github.repository_owner }} password: ${{secrets.GITHUB_TOKEN}} - - name: Upload versioned container to registry - run: docker push ghcr.io/coleifer/sqlite-web:${{ github.ref_name }} + - name: Build and push multi-arch images + uses: docker/build-push-action@v5 + with: + context: ./docker + platforms: linux/amd64,linux/arm64 + push: true + tags: ghcr.io/${{ github.repository_owner }}/sqlite-web:${{github.ref_name}} From 790b95f8e0ab0fc6e73d862940b9e74322cda0fe Mon Sep 17 00:00:00 2001 From: Kirill Ov Date: Wed, 24 Sep 2025 11:45:47 +0200 Subject: [PATCH 2/2] set url-prefix in Docker --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 94fc5934..101ba0d0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -47,4 +47,4 @@ EXPOSE 8080 VOLUME /data WORKDIR /data SHELL ["/bin/ash", "-c"] -CMD sqlite_web -H 0.0.0.0 -x $SQLITE_DATABASE +CMD sqlite_web -H 0.0.0.0 -x $SQLITE_DATABASE --url-prefix ${URL_PREFIX:-/}