diff options
| author | Eugene Triguba <eugenetriguba@gmail.com> | 2024-03-09 10:58:27 -0500 |
|---|---|---|
| committer | Eugene Triguba <eugenetriguba@gmail.com> | 2024-03-09 10:58:27 -0500 |
| commit | fd40c00a9f6ced39edb9eaca8f49548d4eaf1992 (patch) | |
| tree | cbd88cbdc7f3b329662a1c25bd852b0c63e64b6c | |
| parent | Release v0.4.0 (diff) | |
| download | cli-fd40c00a9f6ced39edb9eaca8f49548d4eaf1992.zip | |
Add mysql docker compose file and use matrix in workflow
| -rw-r--r-- | .env | 5 | ||||
| -rw-r--r-- | .env.mysql | 12 | ||||
| -rw-r--r-- | .env.postgres (renamed from .env.bolt-postgres) | 6 | ||||
| -rw-r--r-- | .github/workflows/test.yml | 18 | ||||
| -rw-r--r-- | Dockerfile.test | 7 | ||||
| -rwxr-xr-x | bolt | 2 | ||||
| -rw-r--r-- | docker-compose.mysql.yml | 19 | ||||
| -rw-r--r-- | docker-compose.postgres.yml (renamed from docker-compose.yml) | 16 |
8 files changed, 52 insertions, 33 deletions
@@ -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.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.bolt-postgres b/.env.postgres index af4ec5e..6bff99b 100644 --- a/.env.bolt-postgres +++ b/.env.postgres @@ -1,3 +1,9 @@ +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 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 @@ -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.yml b/docker-compose.postgres.yml index b4d3679..85f34fe 100644 --- a/docker-compose.yml +++ b/docker-compose.postgres.yml @@ -1,23 +1,11 @@ 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 + env_file: + - .env.postgres environment: - POSTGRES_DB=${DB_NAME:?err} - POSTGRES_USER=${DB_USERNAME:?err} |