From bfc239916ea56dc2d59304fd75feac62ca7f4f59 Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Wed, 1 Apr 2026 10:16:59 +0000 Subject: [PATCH 1/6] Remove docker script --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 160ca6c6d..c23c70d74 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "deps": "cross-env-shell ./scripts/deps/update.sh", "deps:check": "node ./scripts/deps/check.js", "deps:types": "./node_modules/typesync/bin/typesync", - "docker": "node ./scripts/docker/generate-docker.js", "format": "pnpm run lint && pnpm run prettier", "lint": "eslint packages/*/source --fix", "lint:dry": "eslint packages/*/source", From cd879a62c9909dc4d42000efda039c0db55c0ad6 Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Wed, 1 Apr 2026 10:28:34 +0000 Subject: [PATCH 2/6] Add container-cli --- scripts/container-cli.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 scripts/container-cli.sh diff --git a/scripts/container-cli.sh b/scripts/container-cli.sh new file mode 100644 index 000000000..a3f27bb57 --- /dev/null +++ b/scripts/container-cli.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# To switch the container CLI to Podman instead of Docker, run: +# export CONTAINER_CLI=podman +# To return to auto-detection mode (Docker or Podman), run: +# unset CONTAINER_CLI +# By default, Docker will have priority over Podman if both are installed. + +if [ -z "$CONTAINER_CLI" ]; then + if command -v docker >/dev/null 2>&1; then + CONTAINER_CLI=docker + elif command -v podman >/dev/null 2>&1; then + CONTAINER_CLI=podman + else + echo "Error: Docker or podman not found." + exit 1 + fi +fi + +$CONTAINER_CLI "$@" \ No newline at end of file From 03c863bc5ec7526bce3e7cd21c73225cf5fcdcd8 Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Wed, 1 Apr 2026 10:31:09 +0000 Subject: [PATCH 3/6] Make executable --- scripts/container-cli.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/container-cli.sh diff --git a/scripts/container-cli.sh b/scripts/container-cli.sh old mode 100644 new mode 100755 From b25de6b5ccf6ca9113fd1d6457744280eaff5371 Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Wed, 1 Apr 2026 10:41:55 +0000 Subject: [PATCH 4/6] Update docker-compose.yml --- docker/local/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/local/docker-compose.yml b/docker/local/docker-compose.yml index f77a2df10..01e8325ca 100644 --- a/docker/local/docker-compose.yml +++ b/docker/local/docker-compose.yml @@ -1,6 +1,6 @@ services: postgres: - image: postgres:18-alpine + image: docker.io/library/postgres:18-alpine tmpfs: /pgtmpfs logging: driver: "none" From f6d1c33e9fd0927ca0697b5ea9023efcf907cb52 Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Wed, 1 Apr 2026 10:48:25 +0000 Subject: [PATCH 5/6] Update scripts --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c23c70d74..5ee50cf27 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,10 @@ "lint:test": "eslint packages/ --ext .test.ts --fix", "madge:circular": "node ./scripts/circular.js", "madge:graph": "./node_modules/madge/bin/cli.js --image circular-graph.svg --extensions ts ./packages/**/source", - "pg:down": "docker compose -f docker/local/docker-compose.yml down", "pg:reset": "pnpm run pg:down -v && pnpm run pg:up", - "pg:up": "docker compose -f docker/local/docker-compose.yml up -d", + "container": "scripts/container-cli.sh", + "pg:up": "pnpm run container compose -f docker/local/docker-compose.yml up -d", + "pg:down": "pnpm run container compose -f docker/local/docker-compose.yml down", "prettier": "prettier --write \"./*.{ts,js,json,md}\" \"./packages/**/*.{ts,js,json,md}\"", "prettier:dry": "prettier --check \"./*.{ts,js,json,md}\" \"./packages/**/*.{ts,js,json,md}\"", "references": "node ./scripts/references/update-references.js", From 4c40fc711316b4f010ff6b4930fc13de7eaa6c11 Mon Sep 17 00:00:00 2001 From: sebastijankuzner <58827427+sebastijankuzner@users.noreply.github.com> Date: Wed, 1 Apr 2026 10:52:33 +0000 Subject: [PATCH 6/6] style: resolve style guide violations [ci-lint-fix] --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5ee50cf27..1a3b07103 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "clean:all": "pnpm run clean && pnpm run clean:node_modules", "clean:node_modules": "rm -rf packages/*/node_modules && rm -rf node_modules", "clean:packages": "rm -rf packages/*/distribution && rm -f packages/*/tsconfig.tsbuildinfo && lerna run clean --parallel", + "container": "scripts/container-cli.sh", "deps": "cross-env-shell ./scripts/deps/update.sh", "deps:check": "node ./scripts/deps/check.js", "deps:types": "./node_modules/typesync/bin/typesync", @@ -25,10 +26,9 @@ "lint:test": "eslint packages/ --ext .test.ts --fix", "madge:circular": "node ./scripts/circular.js", "madge:graph": "./node_modules/madge/bin/cli.js --image circular-graph.svg --extensions ts ./packages/**/source", + "pg:down": "pnpm run container compose -f docker/local/docker-compose.yml down", "pg:reset": "pnpm run pg:down -v && pnpm run pg:up", - "container": "scripts/container-cli.sh", "pg:up": "pnpm run container compose -f docker/local/docker-compose.yml up -d", - "pg:down": "pnpm run container compose -f docker/local/docker-compose.yml down", "prettier": "prettier --write \"./*.{ts,js,json,md}\" \"./packages/**/*.{ts,js,json,md}\"", "prettier:dry": "prettier --check \"./*.{ts,js,json,md}\" \"./packages/**/*.{ts,js,json,md}\"", "references": "node ./scripts/references/update-references.js",