update.py should print versions to build for build.sh

This resolves #167 (comment).

Author: gy-mate

build.sh

@@ -2,23 +2,29 @@
 
 set -e
 
+IMAGE=wiktorn/overpass-api
+
 case "$1" in
 "build")
-	python update.py
+	versions=$(python update.py)
 
-	# docker build
-	find . -maxdepth 1 -type d -name '0.*' -exec sh -c 'docker build -t wiktorn/overpass-api:$(basename "$1") -f "$1"/Dockerfile .' sh {} \;
+	for version in $versions; do
+		docker build --build-arg "OVERPASS_VERSION=${version}" -t "${IMAGE}:${version}" .
+	done
 
-	# docker tag
-	while IFS= read -r -d '' file; do
-		docker tag "wiktorn/overpass-api:$(basename "$file")" wiktorn/overpass-api:latest
-	done < <(find . -maxdepth 1 -type d -regex '\./[0-9]\.[0-9]\.[0-9]*' -print0 | sort -nz | tail -z -n 1)
+	latest=$(echo "$versions" | sort -V | tail -n 1)
+	docker tag "${IMAGE}:${latest}" "${IMAGE}:latest"
 	;;
+
 "push")
-	# docker push
-	find . -maxdepth 1 -type d -name '0.*' -exec sh -c 'docker push "wiktorn/overpass-api:$(basename "$1")"' sh {} \;
-	docker push wiktorn/overpass-api:latest
+	versions=$(python update.py)
+
+	for version in $versions; do
+		docker push "${IMAGE}:${version}"
+	done
+	docker push "${IMAGE}:latest"
 	;;
+
 "$1")
 	echo "Invalid argument $1"
 	echo "Valid arguments:"

update.py

@@ -1,10 +1,12 @@
 import html.parser
-import os
-import pathlib
-import shutil
 import urllib.request
 
 url = "http://dev.overpass-api.de/releases/"
+skip_prefixes = (
+    '0.6', 'eta', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.50', '0.7.52',
+    '0.7.54.11',  # invalid CRC in archive
+    '0.7.51',  # no autoconf
+)
 
 
 class VersionFinder(html.parser.HTMLParser):
@@ -23,31 +25,19 @@ def handle_starttag(self, tag, attrs):
                 self.versions.append(version)
 
 
-def main():
+def versions_to_build():
     parser = VersionFinder()
     response = urllib.request.urlopen(url)
     data = response.read().decode(response.headers.get_content_charset())
     parser.feed(data)
-    with open("Dockerfile") as f:
-        template = f.read()
-    for ver in parser.versions:
-        if any((ver.startswith(x) for x in ('0.6', 'eta', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.50', '0.7.52',
-                                            '0.7.54.11',  # invalid CRC in archive
-                                            '0.7.51',  # no autoconf
-                                            ))) or \
-                ver == '0.7':
-            # ignore old releases
-            continue
-        if os.path.exists(ver):
-            shutil.rmtree(ver)
-        os.mkdir(ver)
-        with open(pathlib.Path(ver) / "Dockerfile", "w+") as f:
-            f.write(template.replace("${OVERPASS_VERSION}", ver))
-        #for i in ("etc", "bin"):
-        #    shutil.copytree(i, pathlib.Path(ver) / i)
-        #shutil.copyfile("docker-entrypoint.sh", pathlib.Path(ver) / "docker-entrypoint.sh")
-        #shutil.copyfile("requirements.txt", pathlib.Path(ver) / "requirements.txt")
+
+    return [
+        version for version in parser.versions
+        if version != '0.7'
+        and not any(version.startswith(skip_prefix) for skip_prefix in skip_prefixes)
+    ]
 
 
 if __name__ == '__main__':
-    main()
+    for version_to_build in versions_to_build():
+        print(version_to_build)