CodeMirror/ArchiveBox
1
0
Fork 0
mirror of synced 2024-06-26 10:00:19 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into plugins-browsertrix

Browse source
This commit is contained in:
Nick Sweeting 2024-04-24 16:59:26 -07:00 committed by GitHub
parent 33e82736f9 3afdd3d96f
commit e59406541d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/docker.yml vendored
View file

@ -31,7 +31,7 @@ jobs:
with: with:
version: latest version: latest
install: true install: true
platforms: linux/amd64,linux/arm64,linux/arm/v7 platforms: linux/amd64,linux/arm64
- name: Builder instance name - name: Builder instance name
run: echo ${{ steps.buildx.outputs.name }} run: echo ${{ steps.buildx.outputs.name }}
@ -55,16 +55,22 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: Collect Docker tags - name: Collect Docker tags
# https://github.com/docker/metadata-action
id: docker_meta id: docker_meta
uses: docker/metadata-action@v5 uses: docker/metadata-action@v5
with: with:
images: archivebox/archivebox,nikisweeting/archivebox images: archivebox/archivebox,nikisweeting/archivebox
tags: | tags: |
# :stable
type=ref,event=branch type=ref,event=branch
# :0.7.3
type=semver,pattern={{version}} type=semver,pattern={{version}}
# :0.7
type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}}.{{minor}}
# :sha-463ea54
type=sha 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 - name: Build and push
id: docker_build id: docker_build
@ -77,7 +83,7 @@ jobs:
tags: ${{ steps.docker_meta.outputs.tags }} tags: ${{ steps.docker_meta.outputs.tags }}
cache-from: type=local,src=/tmp/.buildx-cache cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new 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 - name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }} run: echo ${{ steps.docker_build.outputs.digest }}

4
bin/setup.sh
View file

@ -27,9 +27,9 @@ if (which docker-compose > /dev/null && docker pull archivebox/archivebox:latest
if [ -f "./index.sqlite3" ]; then if [ -f "./index.sqlite3" ]; then
mv -i ~/archivebox/* ~/archivebox/data/ mv -i ~/archivebox/* ~/archivebox/data/
fi 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 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 docker compose run --rm archivebox init --setup
echo echo
echo "[+] Starting ArchiveBox server using: docker compose up -d..." echo "[+] Starting ArchiveBox server using: docker compose up -d..."

2
docker-compose.yml
View file

@ -71,7 +71,7 @@ services:
# not needed after first run / if you have already have ./etc/sonic.cfg present # not needed after first run / if you have already have ./etc/sonic.cfg present
dockerfile_inline: | dockerfile_inline: |
FROM quay.io/curl/curl:latest AS config_downloader 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 FROM valeriansaliou/sonic:latest
COPY --from=config_downloader /tmp/sonic.cfg /etc/sonic.cfg COPY --from=config_downloader /tmp/sonic.cfg /etc/sonic.cfg
expose: expose:

2
docs

@ -1 +1 @@
Subproject commit a1b69c51ba9b249c0b2a6efd141dbb792fc36ad2 Subproject commit f23abba9773b67ad9f2fd04d6f2e8e056dfa6521