diff --git a/docker-compose.bypass-test.yml b/docker-compose.bypass-test.yml deleted file mode 100644 index b3a54490..00000000 --- a/docker-compose.bypass-test.yml +++ /dev/null @@ -1,39 +0,0 @@ -# Bypass testing - switch between dev build and v1.0.1 -# Usage: -# Test dev build: docker compose -f docker-compose.bypass-test.yml up shelfmark-dev -# Test v1.0.1: docker compose -f docker-compose.bypass-test.yml up shelfmark-stable -# Pull latest dev: docker compose -f docker-compose.bypass-test.yml build shelfmark-dev -# Pull v1.0.1: docker compose -f docker-compose.bypass-test.yml pull shelfmark-stable - -services: - # Dev image from registry - shelfmark-dev: - image: ghcr.io/calibrain/shelfmark:dev - container_name: shelfmark-bypass-dev - environment: - PUID: 1000 - PGID: 1000 - DEBUG: true - ports: - - 8084:8084 - volumes: - - ./.local/bypass-test/config-dev:/config - - ./.local/bypass-test/books:/books - - ./.local/bypass-test/log-dev:/var/log/shelfmark - - ./.local/bypass-test/tmp:/tmp/shelfmark - - # Stable v1.0.1 for comparison - shelfmark-stable: - image: ghcr.io/calibrain/shelfmark:1.0.1 - container_name: shelfmark-bypass-stable - environment: - PUID: 1000 - PGID: 1000 - DEBUG: true - ports: - - 8085:8084 - volumes: - - ./.local/bypass-test/config-stable:/config - - ./.local/bypass-test/books:/books - - ./.local/bypass-test/log-stable:/var/log/shelfmark - - ./.local/bypass-test/tmp:/tmp/shelfmark diff --git a/entrypoint.sh b/entrypoint.sh index c66fe6f3..8f37a3bd 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -138,9 +138,7 @@ test_write() { return 1 fi - if ! ( - echo 0123456789_TEST | gosu "$USERNAME" env HOME=/app tee "$test_file" > /dev/null - ); then + if ! gosu "$USERNAME" sh -c 'echo 0123456789_TEST > "$1"' _ "$test_file"; then echo "Failed to write test file in $folder as $USERNAME" return 1 fi