From fd40c00a9f6ced39edb9eaca8f49548d4eaf1992 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 9 Mar 2024 10:58:27 -0500 Subject: Add mysql docker compose file and use matrix in workflow --- .env | 5 ----- .env.bolt-postgres | 6 ------ .env.mysql | 12 ++++++++++++ .env.postgres | 12 ++++++++++++ .github/workflows/test.yml | 18 ++++++++++++------ Dockerfile.test | 7 ------- bolt | 2 +- docker-compose.mysql.yml | 19 +++++++++++++++++++ docker-compose.postgres.yml | 18 ++++++++++++++++++ docker-compose.yml | 30 ------------------------------ 10 files changed, 74 insertions(+), 55 deletions(-) delete mode 100644 .env delete mode 100644 .env.bolt-postgres create mode 100644 .env.mysql create mode 100644 .env.postgres delete mode 100644 Dockerfile.test create mode 100644 docker-compose.mysql.yml create mode 100644 docker-compose.postgres.yml delete mode 100644 docker-compose.yml diff --git a/.env b/.env deleted file mode 100644 index 22d4f3a..0000000 --- a/.env +++ /dev/null @@ -1,5 +0,0 @@ -DB_NAME=test_db -DB_HOST=bolt_postgres_db -DB_PORT=5432 -DB_USERNAME=test_user -DB_PASSWORD=testpassword diff --git a/.env.bolt-postgres b/.env.bolt-postgres deleted file mode 100644 index af4ec5e..0000000 --- a/.env.bolt-postgres +++ /dev/null @@ -1,6 +0,0 @@ -BOLT_CONNECTION_DBNAME=test_db -BOLT_CONNECTION_HOST=bolt_postgres_db -BOLT_CONNECTION_PORT=5432 -BOLT_CONNECTION_USER=test_user -BOLT_CONNECTION_PASSWORD=testpassword -BOLT_CONNECTION_DRIVER=postgres diff --git a/.env.mysql b/.env.mysql new file mode 100644 index 0000000..adc5881 --- /dev/null +++ b/.env.mysql @@ -0,0 +1,12 @@ +DB_NAME=test_db +DB_HOST=bolt_mysql_db +DB_PORT=1234 +DB_USERNAME=test_user +DB_PASSWORD=testpassword + +BOLT_CONNECTION_DBNAME=test_db +BOLT_CONNECTION_HOST=bolt_mysql_db +BOLT_CONNECTION_PORT=1234 +BOLT_CONNECTION_USER=test_user +BOLT_CONNECTION_PASSWORD=testpassword +BOLT_CONNECTION_DRIVER=mysql diff --git a/.env.postgres b/.env.postgres new file mode 100644 index 0000000..6bff99b --- /dev/null +++ b/.env.postgres @@ -0,0 +1,12 @@ +DB_NAME=test_db +DB_HOST=bolt_postgres_db +DB_PORT=5432 +DB_USERNAME=test_user +DB_PASSWORD=testpassword + +BOLT_CONNECTION_DBNAME=test_db +BOLT_CONNECTION_HOST=bolt_postgres_db +BOLT_CONNECTION_PORT=5432 +BOLT_CONNECTION_USER=test_user +BOLT_CONNECTION_PASSWORD=testpassword +BOLT_CONNECTION_DRIVER=postgres diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 252c792..d52fa3e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,17 +2,23 @@ name: Test on: push: - branches: ["main"] + branches: ["dev"] pull_request: - branches: ["main"] + branches: ["dev"] jobs: run-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 + strategy: + matrix: + db: + - {name: postgres, version: 16} + # - {name: mysql, version: 8} steps: - name: Checkout Source Code uses: actions/checkout@v3 - - name: Setup Docker Compose Stack - run: docker compose up --detach + - name: Start Database + run: | + docker run --detach --env-file ".env.${{ matrix.db.name }}" "${{ matrix.db.name }}:${{ matrix.db.version }}" - name: Run Tests - run: docker exec bolt go test -cover ./... + run: env $(cat ".env.${{ matrix.db.name }}" | xargs) go test -cover ./... diff --git a/Dockerfile.test b/Dockerfile.test deleted file mode 100644 index d0337d6..0000000 --- a/Dockerfile.test +++ /dev/null @@ -1,7 +0,0 @@ -FROM golang:1.21.6-alpine3.19 - -RUN apk update && apk add --no-cache bash - -WORKDIR /app -COPY . . -RUN go mod download diff --git a/bolt b/bolt index 0d8cf7b..1b5d03e 100755 --- a/bolt +++ b/bolt @@ -1,2 +1,2 @@ #!/bin/sh -env $(cat .env.bolt-postgres | xargs) go run ./cmd/bolt/bolt.go $@ +env $(cat .env.postgres | xargs) go run ./cmd/bolt/bolt.go $@ diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml new file mode 100644 index 0000000..909e780 --- /dev/null +++ b/docker-compose.mysql.yml @@ -0,0 +1,19 @@ +version: "3.8" + +services: + mysql_db: + image: mysql:8.3 + container_name: bolt_mysql_db + env_file: + - .env.mysql + environment: + - MYSQL_DATABASE=${DB_NAME:?err} + - MYSQL_USER=${DB_USERNAME:?err} + - MYSQL_PASSWORD=${DB_PASSWORD:?err} + - MYSQL_ROOT_PASSWORD=${DB_PASSWORD:?err} + volumes: + - mysql_db_volume:/var/lib/mysql + +volumes: + mysql_db_volume: + name: mysql-db-volume diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml new file mode 100644 index 0000000..85f34fe --- /dev/null +++ b/docker-compose.postgres.yml @@ -0,0 +1,18 @@ +version: "3.8" + +services: + postgres_db: + image: postgres:16.1-alpine3.19 + container_name: bolt_postgres_db + env_file: + - .env.postgres + environment: + - POSTGRES_DB=${DB_NAME:?err} + - POSTGRES_USER=${DB_USERNAME:?err} + - POSTGRES_PASSWORD=${DB_PASSWORD:?err} + volumes: + - postgres_db_volume:/var/lib/postgresql/data + +volumes: + postgres_db_volume: + name: postgres-db-volume diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index b4d3679..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,30 +0,0 @@ -version: "3.8" - -services: - app: - image: eugenetriguba/bolt - container_name: bolt - command: sleep infinity - env_file: - - .env - build: - dockerfile: Dockerfile.test - context: . - volumes: - - ./:/app - depends_on: - - postgres_db - - postgres_db: - image: postgres:16.1-alpine3.19 - container_name: bolt_postgres_db - environment: - - POSTGRES_DB=${DB_NAME:?err} - - POSTGRES_USER=${DB_USERNAME:?err} - - POSTGRES_PASSWORD=${DB_PASSWORD:?err} - volumes: - - postgres_db_volume:/var/lib/postgresql/data - -volumes: - postgres_db_volume: - name: postgres-db-volume -- cgit v1.2.3