refactor(lab): drive docker from python so the cli works on windows and posix without bash
This commit is contained in:
+7
-2
@@ -1,4 +1,9 @@
|
||||
#!/usr/bin/env bash
|
||||
set -eu
|
||||
docker rm -f "${NAME:-p2s-lab}" >/dev/null 2>&1 || true
|
||||
echo "down"
|
||||
HERE=$(cd "$(dirname "$0")" && pwd)
|
||||
cd "$HERE/.."
|
||||
PY=${PYTHON:-}
|
||||
if [ -z "$PY" ]; then
|
||||
if command -v python >/dev/null 2>&1; then PY=python; else PY=python3; fi
|
||||
fi
|
||||
exec "$PY" -m poc lab --down "$@"
|
||||
|
||||
+7
-7
@@ -1,9 +1,9 @@
|
||||
#!/usr/bin/env bash
|
||||
set -eu
|
||||
NAME=${NAME:-p2s-lab}
|
||||
docker exec "$NAME" php -v | head -1
|
||||
docker exec "$NAME" php -i 2>/dev/null | grep -E '^(display_errors|memory_limit|post_max_size|output_buffering|max_file_uploads|max_input_vars|session.upload_progress.enabled|session.save_handler|session.serialize_handler)'
|
||||
docker exec "$NAME" sha256sum /usr/lib/apache2/modules/libphp.so
|
||||
docker exec "$NAME" apache2 -v | head -1
|
||||
docker exec "$NAME" sh -c "grep -v '^#' /etc/apache2/conf-enabled/zz-p2s.conf | grep -v '^$'"
|
||||
docker exec "$NAME" sh -c 'pgrep -c apache2'
|
||||
HERE=$(cd "$(dirname "$0")" && pwd)
|
||||
cd "$HERE/.."
|
||||
PY=${PYTHON:-}
|
||||
if [ -z "$PY" ]; then
|
||||
if command -v python >/dev/null 2>&1; then PY=python; else PY=python3; fi
|
||||
fi
|
||||
exec "$PY" -m poc status "$@"
|
||||
|
||||
@@ -1,34 +1,9 @@
|
||||
#!/usr/bin/env bash
|
||||
set -eu
|
||||
HERE=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -W)
|
||||
ROOT=$(cd "$HERE/.." && pwd -W)
|
||||
IMAGE=${IMAGE:-php:8.4.26-apache}
|
||||
NAME=${NAME:-p2s-lab}
|
||||
PORT=${PORT:-18110}
|
||||
NET=${NET:-}
|
||||
|
||||
docker rm -f "$NAME" >/dev/null 2>&1 || true
|
||||
mkdir -p "$ROOT/out"
|
||||
|
||||
NETARG=""
|
||||
if [ -n "$NET" ]; then
|
||||
docker network create "$NET" >/dev/null 2>&1 || true
|
||||
NETARG="--network $NET"
|
||||
HERE=$(cd "$(dirname "$0")" && pwd)
|
||||
cd "$HERE/.."
|
||||
PY=${PYTHON:-}
|
||||
if [ -z "$PY" ]; then
|
||||
if command -v python >/dev/null 2>&1; then PY=python; else PY=python3; fi
|
||||
fi
|
||||
|
||||
docker run -d --name "$NAME" $NETARG \
|
||||
-p "127.0.0.1:$PORT:80" \
|
||||
-v "$HERE/index.php:/var/www/html/index.php:ro" \
|
||||
-v "$HERE/apache-single-worker.conf:/etc/apache2/conf-enabled/zz-p2s.conf:ro" \
|
||||
-v "$ROOT/out:/out" \
|
||||
"$IMAGE" /bin/sh -c 'cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
|
||||
chown -R www-data:www-data /out 2>/dev/null || true
|
||||
exec apache2-foreground' >/dev/null
|
||||
|
||||
for _ in $(seq 1 60); do
|
||||
if curl -s -m 2 "http://127.0.0.1:$PORT/index.php" >/dev/null 2>&1; then
|
||||
break
|
||||
fi
|
||||
sleep 0.5
|
||||
done
|
||||
echo "target: $(curl -s -m 3 "http://127.0.0.1:$PORT/index.php")"
|
||||
exec "$PY" -m poc lab --up-only "$@"
|
||||
|
||||
Reference in New Issue
Block a user