Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compose commands #45

Merged
merged 3 commits into from
Sep 7, 2024
Merged

Fix compose commands #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f5bc0d
Fix compose commands
Sep 7, 2024
46db712
Bump alpine to 3.20.3 and curl to 8.9.1-r1
Sep 7, 2024
e408afd
Fix transmission version
Sep 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/run-smoke.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading