public/docker-wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/docker synced 2025-12-13 01:36:28 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: public:2.6.10
Branches Tags
public:master public:rewrite
public:2.6.14 public:2.6.13 public:2.6.12 public:2.6.11 public:2.6.10 public:2.6.9 public:2.6.8 public:2.6.7 public:2.6.6 public:2.6.5 public:2.6.4 public:2.6.3 public:2.6.2 public:2.6.1 public:2.5.4 public:2.5.3 public:2.5.2 public:2.5.1 public:2.5.0 public:2.5.0-rc.1 public:2.4.3 public:2.4.2 public:2.4.1 public:2.4.0 public:2.3.8 public:2.3.7 public:2.3.6 public:2.3.5 public:2.3.4 public:2.3.3 public:2.3.2 public:2.3.1 public:2.3.0 public:2.2.3 public:2.2.2 public:2.2.1 public:2.1.6 public:2.1.4 public:2.1.3 public:2.1.2 public:2.1.1 public:2.0.8 public:2.0.7 public:2.0.6 public:2.0.5 public:2.0.4 public:2.0.3 public:2.0.2 public:2.0.1
...
compare: public:2.6.12
Branches Tags
public:master public:rewrite
public:2.6.14 public:2.6.13 public:2.6.12 public:2.6.11 public:2.6.10 public:2.6.9 public:2.6.8 public:2.6.7 public:2.6.6 public:2.6.5 public:2.6.4 public:2.6.3 public:2.6.2 public:2.6.1 public:2.5.4 public:2.5.3 public:2.5.2 public:2.5.1 public:2.5.0 public:2.5.0-rc.1 public:2.4.3 public:2.4.2 public:2.4.1 public:2.4.0 public:2.3.8 public:2.3.7 public:2.3.6 public:2.3.5 public:2.3.4 public:2.3.3 public:2.3.2 public:2.3.1 public:2.3.0 public:2.2.3 public:2.2.2 public:2.2.1 public:2.1.6 public:2.1.4 public:2.1.3 public:2.1.2 public:2.1.1 public:2.0.8 public:2.0.7 public:2.0.6 public:2.0.5 public:2.0.4 public:2.0.3 public:2.0.2 public:2.0.1

9 Commits
2.6.10 ... 2.6.12

Author SHA1 Message Date
Yassine Guedidi
b228deb919 Merge pull request #437 from wallabag/prepare-2.6.12-release 
Prepare 2.6.12 release
 2025-04-10 13:55:21 +02:00
Yassine Guedidi
52afa94c77 Prepare 2.6.12 release 2025-04-10 12:08:12 +02:00
Yassine Guedidi
55976e23e5 Merge pull request #436 from wallabag/prepare-2.6.11-release 
Prepare 2.6.11 release
 2025-04-08 23:09:59 +02:00
Yassine Guedidi
3975a28546 Prepare 2.6.11 release 2025-03-30 06:38:09 +02:00
Kevin Decherf
0e58189b97 Merge pull request #431 from Luensche/patch-1 
Update README.md
 2025-01-23 20:11:14 +01:00
Björn Engel
2d96e30450 Update README.md 
Version in docker-compose.yaml is obsolete.
 2025-01-07 21:40:29 +01:00
Kevin Decherf
364b1b3d84 Merge pull request #428 from wallabag/2.6.x 
Backport 2.6.10 into master
 2024-11-19 21:10:09 +01:00
Jérémy Benoist
d1c4800a3e Merge pull request #427 from wallabag/fix/update-ci 
Update CI
 2024-11-12 09:22:12 +01:00
Jeremy Benoist
4c3ff8a8ac Update CI 
Allow dependabot to keep GA up to date.
 2024-11-12 09:03:21 +01:00
6 changed files with 21 additions and 15 deletions
Expand all files Collapse all files

7
.github/dependabot.yml vendored
View File

@@ -12,3 +12,10 @@ updates:
versions: versions:
- ">= 3.11.a" - ">= 3.11.a"
- "< 3.12" - "< 3.12"
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: weekly
time: "04:00"
timezone: Europe/Paris
open-pull-requests-limit: 10

14
.github/workflows/publish.yml vendored
View File

@@ -13,16 +13,16 @@ jobs:
contents: read contents: read
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Log in to Docker Hub - name: Log in to Docker Hub
uses: docker/login-action@v2 uses: docker/login-action@v3
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: Log in to the Container registry - name: Log in to the Container registry
uses: docker/login-action@v2 uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ github.actor }} username: ${{ github.actor }}
@@ -30,23 +30,23 @@ jobs:
# Documentation: https://github.com/docker/setup-qemu-action # Documentation: https://github.com/docker/setup-qemu-action
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v2 uses: docker/setup-qemu-action@v3
# Documentation: https://github.com/docker/setup-buildx-action # Documentation: https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx - name: Set up Docker Buildx
id: buildx id: buildx
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v3
- name: Extract metadata (tags, labels) for Docker - name: Extract metadata (tags, labels) for Docker
id: meta id: meta
uses: docker/metadata-action@v4 uses: docker/metadata-action@v5
with: with:
images: | images: |
wallabag/wallabag wallabag/wallabag
ghcr.io/${{ github.repository }} ghcr.io/${{ github.repository }}
- name: Build and push Docker images - name: Build and push Docker images
uses: docker/build-push-action@v3 uses: docker/build-push-action@v6
with: with:
context: . context: .
push: true push: true

10
.github/workflows/test.yml vendored
View File

@@ -24,17 +24,17 @@ jobs:
steps: steps:
- name: "Checkout" - name: "Checkout"
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
fetch-depth: 2 fetch-depth: 2
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: 3.11 python-version: 3.11
- name: "Build image" - name: "Build image"
run: docker-compose -f tests/docker-compose.${{ matrix.database }}.yml build run: docker compose -f tests/docker-compose.${{ matrix.database }}.yml build
- name: "Install dependencies" - name: "Install dependencies"
run: pip install pytest pytest-docker requests run: pip install pytest pytest-docker requests
@@ -44,8 +44,8 @@ jobs:
- name: "Get docker logs" - name: "Get docker logs"
if: ${{ always() }} if: ${{ always() }}
run: docker-compose -p "wallabag_${{ matrix.database }}" -f tests/docker-compose.${{ matrix.database }}.yml logs wallabag run: docker compose -p "wallabag_${{ matrix.database }}" -f tests/docker-compose.${{ matrix.database }}.yml logs wallabag
- name: "Cleanup environment" - name: "Cleanup environment"
if: ${{ always() }} if: ${{ always() }}
run: docker-compose -p "wallabag_${{ matrix.database }}" -f tests/docker-compose.${{ matrix.database }}.yml down -v run: docker compose -p "wallabag_${{ matrix.database }}" -f tests/docker-compose.${{ matrix.database }}.yml down -v

2
Dockerfile
View File

@@ -13,7 +13,7 @@ FROM alpine:3.18
COPY --from=builder /go/bin/envsubst /usr/bin/envsubst COPY --from=builder /go/bin/envsubst /usr/bin/envsubst
ARG WALLABAG_VERSION=2.6.10 ARG WALLABAG_VERSION=2.6.12
RUN set -ex \ RUN set -ex \
&& apk add --no-cache \ && apk add --no-cache \

1
README.md
View File

@@ -109,7 +109,6 @@ $ docker exec -t NAME_OR_ID_OF_YOUR_WALLABAG_CONTAINER /var/www/wallabag/bin/con
An example [docker-compose](https://docs.docker.com/compose/) file can be seen below: An example [docker-compose](https://docs.docker.com/compose/) file can be seen below:
``` ```
version: '3'
services: services:
wallabag: wallabag:
image: wallabag/wallabag image: wallabag/wallabag

2
tests/test_login.py
View File

@@ -28,7 +28,7 @@ def docker_cleanup():
@pytest.fixture(scope="session") @pytest.fixture(scope="session")
def docker_compose_command() -> str: def docker_compose_command() -> str:
return "docker-compose" return "docker compose"
@pytest.fixture(scope="session") @pytest.fixture(scope="session")
def docker_compose_file(pytestconfig, database): def docker_compose_file(pytestconfig, database):