aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Triguba <hello@eugenetriguba.com>2025-10-10 19:06:01 -0400
committerEugene Triguba <hello@eugenetriguba.com>2025-10-10 19:06:01 -0400
commiteb6b3fbefb4b9fa3f071401e13757038b084433b (patch)
tree90ee79cf53576e702825c755b2aa985a02221246
parentMove log_info docker ps call (diff)
downloadcli-eb6b3fbefb4b9fa3f071401e13757038b084433b.zip
Remove need for docker compose
-rw-r--r--.build.yml1
-rw-r--r--docker-compose.mssql.yml18
-rw-r--r--docker-compose.mysql.yml15
-rw-r--r--docker-compose.postgresql.yml14
-rw-r--r--scripts/lib/docker.sh119
-rw-r--r--scripts/lib/test.sh23
6 files changed, 129 insertions, 61 deletions
diff --git a/.build.yml b/.build.yml
index 40aceed..b3d1ebb 100644
--- a/.build.yml
+++ b/.build.yml
@@ -2,7 +2,6 @@ image: archlinux
packages:
- go
- docker
- - docker-compose
sources:
- https://git.sr.ht/~eugenetriguba/bolt
tasks:
diff --git a/docker-compose.mssql.yml b/docker-compose.mssql.yml
deleted file mode 100644
index 639cffd..0000000
--- a/docker-compose.mssql.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-services:
- mssql_db:
- image: mcr.microsoft.com/mssql/server:2022-latest
- container_name: bolt_mssql_db
- network_mode: host
- healthcheck:
- test:
- [
- "CMD-SHELL",
- "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P TestPass123! -Q 'SELECT 1' -C || exit 1",
- ]
- interval: 10s
- timeout: 3s
- start_period: 10s
- retries: 10
- environment:
- - ACCEPT_EULA=Y
- - MSSQL_SA_PASSWORD=TestPass123!
diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml
deleted file mode 100644
index 443960c..0000000
--- a/docker-compose.mysql.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-services:
- mysql_db:
- image: mysql:8.3
- container_name: bolt_mysql_db
- network_mode: host
- healthcheck:
- test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
- interval: 10s
- timeout: 5s
- retries: 5
- environment:
- - MYSQL_DATABASE=test_db
- - MYSQL_USER=test_user
- - MYSQL_PASSWORD=testpassword
- - MYSQL_ROOT_PASSWORD=testpassword
diff --git a/docker-compose.postgresql.yml b/docker-compose.postgresql.yml
deleted file mode 100644
index 737eb3e..0000000
--- a/docker-compose.postgresql.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-services:
- postgres_db:
- image: postgres:16.1-alpine3.19
- container_name: bolt_postgresql_db
- network_mode: host
- healthcheck:
- test: ["CMD-SHELL", "pg_isready -U postgres"]
- interval: 10s
- timeout: 5s
- retries: 5
- environment:
- - POSTGRES_DB=test_db
- - POSTGRES_USER=test_user
- - POSTGRES_PASSWORD=testpassword
diff --git a/scripts/lib/docker.sh b/scripts/lib/docker.sh
index 5c5f6a0..6488bb0 100644
--- a/scripts/lib/docker.sh
+++ b/scripts/lib/docker.sh
@@ -4,18 +4,121 @@ readonly BOLT_DOCKER_LOADED=1
source "$(dirname "${BASH_SOURCE[0]}")/log.sh"
-docker_compose_up() {
- local compose_file="$1"
- log_info "Starting services from '$compose_file'..."
- docker compose --file "$compose_file" up --detach
+# Start a PostgreSQL database container
+#
+# ARGUMENTS:
+# $1: Container name (default: bolt_postgresql_db)
+#
+# ENVIRONMENT:
+# - POSTGRES_DB (default: test_db)
+# - POSTGRES_USER (default: test_user)
+# - POSTGRES_PASSWORD (default: testpassword)
+#
+docker_start_postgresql() {
+ local container_name="${1:-bolt_postgresql_db}"
+ local postgres_db="${POSTGRES_DB:-test_db}"
+ local postgres_user="${POSTGRES_USER:-test_user}"
+ local postgres_password="${POSTGRES_PASSWORD:-testpassword}"
+
+ log_info "Starting PostgreSQL container '$container_name'..."
+
+ docker run --detach \
+ --name "$container_name" \
+ --publish 5432:5432 \
+ --health-cmd "pg_isready -U postgres" \
+ --health-interval 10s \
+ --health-timeout 5s \
+ --health-retries 5 \
+ --env POSTGRES_DB="$postgres_db" \
+ --env POSTGRES_USER="$postgres_user" \
+ --env POSTGRES_PASSWORD="$postgres_password" \
+ postgres:16.1-alpine3.19
+}
+
+# Start a MySQL database container
+#
+# ARGUMENTS:
+# $1: Container name (default: bolt_mysql_db)
+#
+# ENVIRONMENT:
+# - MYSQL_DATABASE (default: test_db)
+# - MYSQL_USER (default: test_user)
+# - MYSQL_PASSWORD (default: testpassword)
+# - MYSQL_ROOT_PASSWORD (default: testpassword)
+#
+docker_start_mysql() {
+ local container_name="${1:-bolt_mysql_db}"
+ local mysql_database="${MYSQL_DATABASE:-test_db}"
+ local mysql_user="${MYSQL_USER:-test_user}"
+ local mysql_password="${MYSQL_PASSWORD:-testpassword}"
+ local mysql_root_password="${MYSQL_ROOT_PASSWORD:-testpassword}"
+
+ log_info "Starting MySQL container '$container_name'..."
+
+ docker run --detach \
+ --name "$container_name" \
+ --publish 3306:3306 \
+ --health-cmd "mysqladmin ping -h localhost" \
+ --health-interval 10s \
+ --health-timeout 5s \
+ --health-retries 5 \
+ --env MYSQL_DATABASE="$mysql_database" \
+ --env MYSQL_USER="$mysql_user" \
+ --env MYSQL_PASSWORD="$mysql_password" \
+ --env MYSQL_ROOT_PASSWORD="$mysql_root_password" \
+ mysql:8.3
}
-docker_compose_down() {
- local compose_file="$1"
- log_info "Stopping services from '$compose_file'..."
- docker compose --file "$compose_file" down
+# Start a MSSQL database container
+#
+# ARGUMENTS:
+# $1: Container name (default: bolt_mssql_db)
+#
+# ENVIRONMENT:
+# - MSSQL_SA_PASSWORD (default: TestPass123!)
+#
+docker_start_mssql() {
+ local container_name="${1:-bolt_mssql_db}"
+ local mssql_sa_password="${MSSQL_SA_PASSWORD:-TestPass123!}"
+
+ log_info "Starting MSSQL container '$container_name'..."
+
+ docker run --detach \
+ --name "$container_name" \
+ --publish 1433:1433 \
+ --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $mssql_sa_password -Q 'SELECT 1' -C || exit 1" \
+ --health-interval 10s \
+ --health-timeout 3s \
+ --health-start-period 10s \
+ --health-retries 10 \
+ --env ACCEPT_EULA=Y \
+ --env MSSQL_SA_PASSWORD="$mssql_sa_password" \
+ mcr.microsoft.com/mssql/server:2022-latest
+}
+
+# Stop and remove a database container
+#
+# ARGUMENTS:
+# $1: Container name
+#
+docker_stop_container() {
+ local container_name="$1"
+
+ log_info "Stopping and removing container '$container_name'..."
+ docker stop "$container_name" >/dev/null 2>&1 || true
+ docker rm "$container_name" >/dev/null 2>&1 || true
}
+# Wait for a container to be healthy
+#
+# ARGUMENTS:
+# $1: Container name
+# $2: Timeout in seconds (default: 60)
+#
+# RETURN:
+# 0 - Container is healthy
+# 1 - Container not found, unhealthy, or timeout
+#
docker_wait_for_healthy_container() {
local container_name="$1"
local timeout="${2:-60}"
diff --git a/scripts/lib/test.sh b/scripts/lib/test.sh
index a90eb2c..22fa8eb 100644
--- a/scripts/lib/test.sh
+++ b/scripts/lib/test.sh
@@ -21,7 +21,6 @@ source "$(dirname "${BASH_SOURCE[0]}")/env.sh"
#
# FILES REQUIRED:
# .env.{test_name} - Environment file with database configuration
-# docker-compose.{test_name}.yml - Docker Compose configuration (unless $1 is sqlite3)
#
# RETURN:
# 0 - Tests passed successfully
@@ -35,7 +34,6 @@ test_run_suite() {
local db_test_suite_name="$1"
local container_name="bolt_${db_test_suite_name}_db"
local env_file="${PATH_PROJECT_DIR}/.env.${db_test_suite_name}"
- local compose_file="${PATH_PROJECT_DIR}/docker-compose.${db_test_suite_name}.yml"
local coverage_file="${PATH_PROJECT_DIR}/coverage-${db_test_suite_name}.out"
local test_result=0
@@ -43,11 +41,26 @@ test_run_suite() {
if [[ $db_test_suite_name != "sqlite3" ]]; then
log_step "Starting $container_name..."
- docker_compose_up "$compose_file"
+
+ case "$db_test_suite_name" in
+ "postgresql")
+ docker_start_postgresql "$container_name"
+ ;;
+ "mysql")
+ docker_start_mysql "$container_name"
+ ;;
+ "mssql")
+ docker_start_mssql "$container_name"
+ ;;
+ *)
+ log_error "Unknown database test suite: $db_test_suite_name"
+ return 1
+ ;;
+ esac
if ! docker_wait_for_healthy_container "$container_name"; then
log_error "Failed to start $container_name container"
- docker_compose_down "$compose_file"
+ docker_stop_container "$container_name"
return 1
fi
fi
@@ -60,7 +73,7 @@ test_run_suite() {
if [[ $db_test_suite_name != "sqlite3" ]]; then
log_step "Cleaning up..."
- docker_compose_down "$compose_file" || log_warn "Unable to clean up docker compose services"
+ docker_stop_container "$container_name" || log_warn "Unable to clean up container"
fi
return $test_result