diff --git a/Dockerfile b/Dockerfile index 070e281..4e8d338 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Use Alpine Linux as the base image -FROM alpine:3.20.2 +FROM alpine:3.20.3 # required env vars ENV GLUETUN_ENDPOINT=$GLUETUN_ENDPOINT @@ -9,7 +9,7 @@ ENV TRANSMISSION_PASS=$TRANSMISSION_PASS ENV PEERPORT_CHECK_INTERVAL=$PEERPORT_CHECK_INTERVAL # install packages -RUN apk add --no-cache transmission-remote=4.0.5-r2 jq=1.7.1-r0 bash=5.2.26-r0 curl=8.9.0-r0 +RUN apk add --no-cache transmission-remote=4.0.5-r2 jq=1.7.1-r0 bash=5.2.26-r0 curl=8.9.1-r1 # copy script to container COPY entrypoint.sh /entrypoint.sh diff --git a/Makefile b/Makefile index 0455de1..26ebe2f 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL := /bin/bash DOCKER_REPO := miklosbagi/gluetrans GHCR_REPO := ghcr.io/miklosbagi/gluetranspia DOCKER_BUILD_CMD := docker buildx build --platform linux/amd64,linux/arm64 -DOCKER_COMPOSE_CMD := docker-compose -f test/docker-compose-build.yaml +DOCKER_COMPOSE_CMD := docker compose -f test/docker-compose-build.yaml GLUETUN_VERSION := v3.38.0 TRANSMISSION_VERSION := 4.0.5 diff --git a/test/run-smoke.sh b/test/run-smoke.sh index 05fd981..deb2408 100755 --- a/test/run-smoke.sh +++ b/test/run-smoke.sh @@ -8,7 +8,7 @@ check_docker_logs() { pattern=$2 end_time=$((SECONDS+TIMEOUT)) while [ $SECONDS -lt $end_time ]; do - if docker_logs=$(docker-compose -f "$COMPOSE_FILE" logs "$SERVICE_NAME" 2>&1 | tac); then + if docker_logs=$(docker compose -f "$COMPOSE_FILE" logs "$SERVICE_NAME" 2>&1 | tac); then if echo "$docker_logs" | grep -qE "$pattern"; then echo " 👍🏻 [$test_name] passed: Pattern '$pattern' found in the logs." return 0