wip: add version.txt to store full version for docker tag name's version part

Author: sanak

Makefile

@@ -8,8 +8,12 @@ build: $(VERSIONS)
 
 define pgrouting-version
 $1:
-	docker build --pull -t $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1) $1
-	docker build -t $(REPO_NAME)/$(IMAGE_NAME)-extra:$(shell echo $1) $1/extra
+	docker build --pull -t $(REPO_NAME)/$(IMAGE_NAME):$(shell cat $1/version.txt) $1
+	docker build -t $(REPO_NAME)/$(IMAGE_NAME)-extra:$(shell cat $1/version.txt) $1/extra
+	if [ "$(shell echo $1)" != "$(shell cat $1/version.txt)" ]; then\
+		docker tag $(REPO_NAME)/$(IMAGE_NAME):$(shell cat $1/version.txt) $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1);\
+		docker tag $(REPO_NAME)/$(IMAGE_NAME)-extra:$(shell cat $1/version.txt) $(REPO_NAME)/$(IMAGE_NAME)-extra:$(shell echo $1);\
+	fi
 endef
 $(foreach version,$(VERSIONS),$(eval $(call pgrouting-version,$(version))))
 

README.md

@@ -71,17 +71,17 @@ $ docker-compose up
 
 Run postgres database:
 ```sh
-$ docker run --name pgrouting -e POSTGRES_PASSWORD=postgres -p 5432:5432 -d pgrouting/pgrouting:15-3.3-3.4.1
+$ cd 15-3.3-3.4
+$ docker run --name pgrouting -e POSTGRES_PASSWORD=postgres -p 5432:5432 -d pgrouting/pgrouting:$(cat version.txt)
 ```
 
 ## How to build images
 
 Building images:
 ```sh
 $ cd 15-3.3-3.4
-$ docker build -t pgrouting/pgrouting:15-3.3-3.4.1 .
+$ docker build -t pgrouting/pgrouting:$(cat version.txt) .
 ```
-(Check pgrouting full version from `./15-3.3-3.4/README.md`.)
 
 ### Using psql with Docker compose:
 

update.sh

@@ -95,6 +95,7 @@ for version in "${versions[@]}"; do
         sed -i 's/%%PG_MAJOR%%/'"$postgresVersion"'/g; s/%%POSTGIS_VERSION%%/'"$postgisVersion"'/g; s/%%PGROUTING_VERSION%%/'"$pgroutingVersion"'/g;' "$version/docker-compose.yml"
         mv "$version/extra/Dockerfile.template" "$version/extra/Dockerfile"
         sed -i 's/%%PG_MAJOR%%/'"$postgresVersion"'/g; s/%%POSTGIS_VERSION%%/'"$postgisVersion"'/g; s/%%PGROUTING_VERSION%%/'"$pgroutingVersion"'/g; s/%%PQXX_VERSION%%/'"$pqxxVersion"'/g;' "$version/extra/Dockerfile"
+        echo "$postgresVersion-$postgisVersion-$pgroutingVersion" > "$version/version.txt"
     )
 done