me/pi-ku
1
0
Fork 0
mirror of https://github.com/ramvignesh-b/pi-ku.git synced 2026-05-04 08:56:52 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ci: improve compatibility for docker-compose execution

Browse Source
This commit is contained in:
ramvignesh-b
2026-04-17 01:30:57 +05:30
parent c40e3d20cb
commit 06585163d0
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/vite.config.ts
+3 -3
View File
@@ -9,10 +9,10 @@ import { getBaseUrl } from "./utils/url-builder";
export default defineConfig(({ mode }) => { export default defineConfig(({ mode }) => {
const env = loadEnv(mode, "../", ""); const env = loadEnv(mode, "../", "");
const isSslEnabled = env.SSL_ENABLED === "true"; const isSslEnabled = env.SSL_ENABLED === "true";
let ssl_certs: { key: Buffer; cert: Buffer }; let sslCerts: { key: Buffer; cert: Buffer } | undefined;
if (isSslEnabled) { if (isSslEnabled) {
ssl_certs = { sslCerts = {
key: fs.readFileSync( key: fs.readFileSync(
path.resolve(__dirname, "../certs/localhost-key.pem"), path.resolve(__dirname, "../certs/localhost-key.pem"),
), ),
@@ -35,7 +35,7 @@ export default defineConfig(({ mode }) => {
server: { server: {
port: Number(env.FRONTEND_PORT), port: Number(env.FRONTEND_PORT),
host: env.FRONTEND_DOMAIN, host: env.FRONTEND_DOMAIN,
https: isSslEnabled ? ssl_certs : undefined, https: isSslEnabled ? sslCerts : undefined,
}, },
}; };
}); });
scripts/run-e2e.sh
+7 -2
View File
@@ -3,6 +3,7 @@ set -e
# Use podman if available. Not everyone has it # Use podman if available. Not everyone has it
CONTAINER_BIN=$(command -v podman || command -v docker) CONTAINER_BIN=$(command -v podman || command -v docker)
echo "Using $CONTAINER_BIN for container operations..."
ENV_FILE="./.env.e2e" ENV_FILE="./.env.e2e"
@@ -24,8 +25,12 @@ cleanup() {
} }
trap cleanup EXIT trap cleanup EXIT
echo "Starting Database..." echo "Starting Database and Mail server..."
$CONTAINER_BIN compose -f "./docker-compose.e2e.yml" up -d if [ "$CONTAINER_BIN" = "podman" ]; then
podman compose -f "./docker-compose.e2e.yml" up -d
else
docker-compose -f "./docker-compose.e2e.yml" up -d
fi
# postgress will take some time, so we wait, and no race condition. Also, no point in logging this output # postgress will take some time, so we wait, and no race condition. Also, no point in logging this output
until $CONTAINER_BIN exec "$DB_NAME" pg_isready -U "${DB_USER:-test}" >/dev/null 2>&1; do until $CONTAINER_BIN exec "$DB_NAME" pg_isready -U "${DB_USER:-test}" >/dev/null 2>&1; do