Merge pull request #628 from peterstace/docker_compose_improvements

Update docker compose setup for best practices
peterstace · Jun 23, 2024 · a2b0677 · a2b0677
2 parents 1212171 + a71fdda
commit a2b0677
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 12 deletions.
diff --git a/.ci/docker-compose-cmpgeos.yml → .ci/compose-cmpgeos.yaml b/.ci/docker-compose-cmpgeos.yml → .ci/compose-cmpgeos.yaml
@@ -1,4 +1,3 @@
-version: "3.7"
 services:
   cmprefimpl:
     build:

diff --git a/.ci/docker-compose-cmppg.yml → .ci/compose-cmppg.yaml b/.ci/docker-compose-cmppg.yml → .ci/compose-cmppg.yaml
@@ -1,4 +1,3 @@
-version: "2.1"
 services:
   postgis:
     image: ghcr.io/baosystems/postgis:15

diff --git a/.ci/docker-compose-geos.yml → .ci/compose-geos.yaml b/.ci/docker-compose-geos.yml → .ci/compose-geos.yaml
@@ -1,4 +1,3 @@
-version: "2.1"
 services:
   geostests:
     build:

diff --git a/.ci/docker-compose-lint.yml → .ci/compose-lint.yaml b/.ci/docker-compose-lint.yml → .ci/compose-lint.yaml
@@ -1,4 +1,3 @@
-version: "2.1"
 services:
   lint:
     build:

diff --git a/.ci/docker-compose-pgscan.yml → .ci/compose-pgscan.yaml b/.ci/docker-compose-pgscan.yml → .ci/compose-pgscan.yaml
@@ -1,4 +1,3 @@
-version: "2.1"
 services:
   postgis:
     image: ghcr.io/baosystems/postgis:15

diff --git a/.ci/docker-compose-unit.yml → .ci/compose-unit.yaml b/.ci/docker-compose-unit.yml → .ci/compose-unit.yaml
@@ -1,4 +1,3 @@
-version: "2.1"
 services:
   tests:
     image: golang:1.17

diff --git a/.github/workflows/ci.yml → .github/workflows/ci.yaml b/.github/workflows/ci.yml → .github/workflows/ci.yaml
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ all: unit lint geos pgscan cmppg cmpgeos
 DC_RUN = \
 	docker compose \
 	--project-name sf-$$task \
-	--file .ci/docker-compose-$$task.yml \
+	--file .ci/compose-$$task.yaml \
 	up \
 	--abort-on-container-exit \
 	--build
@@ -32,26 +32,26 @@ cmpgeos:
 DC_GEOS_RUN = \
 	docker compose \
 	--project-name sf-geos-$$(echo $$geos_version | sed 's/\./-/g') \
-	--file .ci/docker-compose-geos.yml \
+	--file .ci/compose-geos.yaml \
 	up \
 	--build \
 	--abort-on-container-exit
 
 .PHONY: geos-3.12
 geos-3.12:
-	export alpine_version=3.19 geos_version=3.12.1-r0; $(DC_GEOS_RUN)
+	export tags='' alpine_version=3.19 geos_version=3.12.1-r0; $(DC_GEOS_RUN)
 
 .PHONY: geos-3.11
 geos-3.11:
-	export alpine_version=3.18 geos_version=3.11.2-r0; $(DC_GEOS_RUN)
+	export tags='' alpine_version=3.18 geos_version=3.11.2-r0; $(DC_GEOS_RUN)
 
 .PHONY: geos-3.10
 geos-3.10:
-	export alpine_version=3.16 geos_version=3.10.3-r0; $(DC_GEOS_RUN)
+	export tags='' alpine_version=3.16 geos_version=3.10.3-r0; $(DC_GEOS_RUN)
 
 .PHONY: geos-3.9
 geos-3.9:
-	export alpine_version=3.14 geos_version=3.9.1-r0; $(DC_GEOS_RUN)
+	export tags='' alpine_version=3.14 geos_version=3.9.1-r0; $(DC_GEOS_RUN)
 
 .PHONY: geos-3.8
 geos-3.8: