fix: remove socket volume, use TCP via --link
This commit is contained in:
@@ -5,8 +5,6 @@ IMAGE="$1"
|
|||||||
CONTAINER_NAME="test-$(echo "$IMAGE" | tr ':/' '-')-$$"
|
CONTAINER_NAME="test-$(echo "$IMAGE" | tr ':/' '-')-$$"
|
||||||
DB_CONTAINER="ttrss-db-$$"
|
DB_CONTAINER="ttrss-db-$$"
|
||||||
TMPDIR="$(mktemp -d)"
|
TMPDIR="$(mktemp -d)"
|
||||||
SOCKET_DIR="$TMPDIR/pg-socket"
|
|
||||||
mkdir -p "$SOCKET_DIR"
|
|
||||||
trap 'docker rm -f "$CONTAINER_NAME" 2>/dev/null; docker rm -f "$DB_CONTAINER" 2>/dev/null; rm -rf "$TMPDIR"' EXIT
|
trap 'docker rm -f "$CONTAINER_NAME" 2>/dev/null; docker rm -f "$DB_CONTAINER" 2>/dev/null; rm -rf "$TMPDIR"' EXIT
|
||||||
|
|
||||||
DOCKER_GW=$(docker network inspect bridge --format '{{range .IPAM.Config}}{{.Gateway}}{{end}}')
|
DOCKER_GW=$(docker network inspect bridge --format '{{range .IPAM.Config}}{{.Gateway}}{{end}}')
|
||||||
@@ -39,7 +37,6 @@ assert_contains() {
|
|||||||
echo "Starting PostgreSQL..."
|
echo "Starting PostgreSQL..."
|
||||||
docker pull postgres:16-alpine > /dev/null 2>&1
|
docker pull postgres:16-alpine > /dev/null 2>&1
|
||||||
docker run -d --name "$DB_CONTAINER" \
|
docker run -d --name "$DB_CONTAINER" \
|
||||||
-v "$SOCKET_DIR:/var/run/postgresql" \
|
|
||||||
-e POSTGRES_DB=ttrss -e POSTGRES_USER=ttrss -e POSTGRES_PASSWORD=ttrss \
|
-e POSTGRES_DB=ttrss -e POSTGRES_USER=ttrss -e POSTGRES_PASSWORD=ttrss \
|
||||||
postgres:16-alpine
|
postgres:16-alpine
|
||||||
|
|
||||||
@@ -54,7 +51,6 @@ done
|
|||||||
|
|
||||||
echo "Starting TTRSS..."
|
echo "Starting TTRSS..."
|
||||||
docker run -d --name "$CONTAINER_NAME" \
|
docker run -d --name "$CONTAINER_NAME" \
|
||||||
-v "$SOCKET_DIR:/run/postgresql" \
|
|
||||||
--link "$DB_CONTAINER:db" -p 8080:8080 "$IMAGE"
|
--link "$DB_CONTAINER:db" -p 8080:8080 "$IMAGE"
|
||||||
|
|
||||||
echo "Waiting for TTRSS to be ready..."
|
echo "Waiting for TTRSS to be ready..."
|
||||||
|
|||||||
Reference in New Issue
Block a user