From 463ea546163e6623c2eb609311707d57579981c5 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Wed, 24 Apr 2024 16:38:00 -0700 Subject: [PATCH 1/2] remove references to main branch in favor of stable branch --- bin/setup.sh | 4 ++-- docker-compose.yml | 28 ++++++++++++++-------------- docs | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/setup.sh b/bin/setup.sh index 3ca41a29..0dbb97c5 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -27,9 +27,9 @@ if (which docker-compose > /dev/null && docker pull archivebox/archivebox:latest if [ -f "./index.sqlite3" ]; then mv -i ~/archivebox/* ~/archivebox/data/ fi - curl -fsSL 'https://raw.githubusercontent.com/ArchiveBox/ArchiveBox/main/docker-compose.yml' > docker-compose.yml + curl -fsSL 'https://raw.githubusercontent.com/ArchiveBox/ArchiveBox/stable/docker-compose.yml' > docker-compose.yml mkdir -p ./etc - curl -fsSL 'https://raw.githubusercontent.com/ArchiveBox/ArchiveBox/main/etc/sonic.cfg' > ./etc/sonic.cfg + curl -fsSL 'https://raw.githubusercontent.com/ArchiveBox/ArchiveBox/stable/etc/sonic.cfg' > ./etc/sonic.cfg docker compose run --rm archivebox init --setup echo echo "[+] Starting ArchiveBox server using: docker compose up -d..." diff --git a/docker-compose.yml b/docker-compose.yml index 846b3ab7..39aa364c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,17 +48,17 @@ services: # $ docker compose restart archivebox_scheduler archivebox_scheduler: - image: archivebox/archivebox:latest - command: schedule --foreground --update --every=day - environment: - - TIMEOUT=120 # use a higher timeout than the main container to give slow tasks more time when retrying - # - PUID=502 # set to your host user's UID & GID if you encounter permissions issues - # - PGID=20 - volumes: - - ./data:/data - # cpus: 2 # uncomment / edit these values to limit scheduler container resource consumption - # mem_limit: 2048m - # restart: always + image: archivebox/archivebox:latest + command: schedule --foreground --update --every=day + environment: + - TIMEOUT=120 # use a higher timeout than the main container to give slow tasks more time when retrying + # - PUID=502 # set to your host user's UID & GID if you encounter permissions issues + # - PGID=20 + volumes: + - ./data:/data + # cpus: 2 # uncomment / edit these values to limit scheduler container resource consumption + # mem_limit: 2048m + # restart: always ### This runs the optional Sonic full-text search backend (much faster than default rg backend). @@ -72,7 +72,7 @@ services: # not needed after first run / if you have already have ./etc/sonic.cfg present dockerfile_inline: | FROM quay.io/curl/curl:latest AS config_downloader - RUN curl -fsSL 'https://raw.githubusercontent.com/ArchiveBox/ArchiveBox/main/etc/sonic.cfg' > /tmp/sonic.cfg + RUN curl -fsSL 'https://raw.githubusercontent.com/ArchiveBox/ArchiveBox/stable/etc/sonic.cfg' > /tmp/sonic.cfg FROM valeriansaliou/sonic:latest COPY --from=config_downloader /tmp/sonic.cfg /etc/sonic.cfg expose: @@ -99,7 +99,7 @@ services: # restricted to access from localhost by default because it has no authentication - 127.0.0.1:8080:8080 - + ### Example: Put Nginx in front of the ArchiveBox server for SSL termination and static file serving. # You can also any other ingress provider for SSL like Apache, Caddy, Traefik, Cloudflare Tunnels, etc. @@ -173,7 +173,7 @@ services: ### Example: run all your ArchiveBox traffic through a WireGuard VPN tunnel to avoid IP blocks. # You can also use any other VPN that works at the docker IP level, e.g. Tailscale, OpenVPN, etc. - + # wireguard: # image: linuxserver/wireguard:latest # network_mode: 'service:archivebox' diff --git a/docs b/docs index a1b69c51..f23abba9 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit a1b69c51ba9b249c0b2a6efd141dbb792fc36ad2 +Subproject commit f23abba9773b67ad9f2fd04d6f2e8e056dfa6521 From 3afdd3d96fcdf07c47b6bd262ff7c8445273c720 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Wed, 24 Apr 2024 16:55:14 -0700 Subject: [PATCH 2/2] remove Docker arm/v7 auto-builds, rename :main to :stable --- .github/workflows/docker.yml | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 871f0260..ca972695 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,7 +11,7 @@ on: env: DOCKER_IMAGE: archivebox-ci - + jobs: buildx: runs-on: ubuntu-latest @@ -24,21 +24,21 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v3 - + - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v3 with: version: latest install: true - platforms: linux/amd64,linux/arm64,linux/arm/v7 - + platforms: linux/amd64,linux/arm64 + - name: Builder instance name run: echo ${{ steps.buildx.outputs.name }} - + - name: Available platforms run: echo ${{ steps.buildx.outputs.platforms }} - + - name: Cache Docker layers uses: actions/cache@v3 with: @@ -51,21 +51,27 @@ jobs: uses: docker/login-action@v3 if: github.event_name != 'pull_request' with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Collect Docker tags + # https://github.com/docker/metadata-action id: docker_meta uses: docker/metadata-action@v5 with: images: archivebox/archivebox,nikisweeting/archivebox tags: | + # :stable type=ref,event=branch + # :0.7.3 type=semver,pattern={{version}} + # :0.7 type=semver,pattern={{major}}.{{minor}} + # :sha-463ea54 type=sha - type=raw,value=latest,enable={{is_default_branch}} - + # :latest + type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'stable') }} + - name: Build and push id: docker_build uses: docker/build-push-action@v5 @@ -77,7 +83,7 @@ jobs: tags: ${{ steps.docker_meta.outputs.tags }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new - platforms: linux/amd64,linux/arm64,linux/arm/v7 + platforms: linux/amd64,linux/arm64 - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} @@ -88,7 +94,7 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} repository: archivebox/archivebox - + # This ugly bit is necessary if you don't want your cache to grow forever # until it hits GitHub's limit of 5GB. # Temp fix