From 770d6287cef0e0d1372cae7940e6d5077e80464f Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Sat, 17 Jan 2026 11:49:58 +0100 Subject: [PATCH] refactor: use main docker image --- Dockerfile | 2 +- app/test/integration/backends/Dockerfile.tester | 14 -------------- app/test/integration/backends/docker-compose.yml | 5 +++-- 3 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 app/test/integration/backends/Dockerfile.tester diff --git a/Dockerfile b/Dockerfile index 10e0d122..ed4b5029 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ENV VITE_RESTIC_VERSION=${RESTIC_VERSION} \ RUN apk update --no-cache && \ apk upgrade --no-cache && \ - apk add --no-cache davfs2=1.6.1-r2 openssh-client fuse3 sshfs tini nfs-utils cifs-utils util-linux + apk add --no-cache davfs2=1.6.1-r2 openssh-client fuse3 sshfs tini nfs-utils cifs-utils util-linux kmod netcat-openbsd ENTRYPOINT ["/sbin/tini", "-s", "--"] diff --git a/app/test/integration/backends/Dockerfile.tester b/app/test/integration/backends/Dockerfile.tester deleted file mode 100644 index 415a9765..00000000 --- a/app/test/integration/backends/Dockerfile.tester +++ /dev/null @@ -1,14 +0,0 @@ -FROM oven/bun:latest - -RUN apt-get update && apt-get install -y \ - cifs-utils \ - nfs-common \ - davfs2 \ - sshfs \ - kmod \ - iputils-ping \ - netcat-openbsd \ - && rm -rf /var/lib/apt/lists/* - -WORKDIR /app - diff --git a/app/test/integration/backends/docker-compose.yml b/app/test/integration/backends/docker-compose.yml index b05b7666..1cf561c1 100644 --- a/app/test/integration/backends/docker-compose.yml +++ b/app/test/integration/backends/docker-compose.yml @@ -2,8 +2,9 @@ services: # The Test Runner tester: build: - context: . - dockerfile: Dockerfile.tester + context: ../../../../ + dockerfile: Dockerfile + target: production privileged: true # Required for mount operations volumes: - ../../../../:/app