Enable build of multi-platform images thanks to docker buildx

Author: Quetzacoalt91

base/docker_tags.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+declare PLATFORM_ARGS="linux/arm/v7,linux/arm64/v8,linux/amd64"
+declare DOCKER_REPOSITORY="prestashop/base"
+
 cd $(cd "$( dirname "$0" )" && pwd)
 
 if [ -z "$1" ] || [ "$1" == "-p" ]; then
@@ -21,28 +24,23 @@ while getopts ":fp" option; do
 done
 
 docker_tag_exists() {
-    curl --silent -f -lSL https://hub.docker.com/v2/repositories/$1/tags/$2 > /dev/null
+    curl --silent -f -lSL https://hub.docker.com/v2/repositories/$1/tags/$2 2> /dev/null
 }
 
 docker_image()
 {
-    if ! $FORCE && docker_tag_exists prestashop/base ${version}; then
-        echo "Docker Image already pushed : prestashop/base:$version"
+    if ! $FORCE && docker_tag_exists ${DOCKER_REPOSITORY} ${version}; then
+        echo "Docker Image already pushed : $DOCKER_REPOSITORY:$version"
         return
     else 
-        echo "Docker build & tag : prestashop/base:$version"
-        id=$(echo $(docker build --quiet=true images/${version} 2>/dev/null) | awk '{print $NF}')
-        echo $id;
-        docker tag $id prestashop/base:${version}
-
-
-        if [ -z "$PUSH" ]; then
-            # Do not push
-            return
-        fi
-        echo "Docker Push : prestashop/base:$version"
-
-        docker push prestashop/base:${version}
+        echo "Docker build & tag : $DOCKER_REPOSITORY:$version"
+        docker buildx build \
+            --progress=plain \
+            --platform ${PLATFORM_ARGS} \
+            --builder container \
+            --tag ${DOCKER_REPOSITORY}:${version} \
+            $([ "${PUSH}" == "true" ] && echo "--push" || echo "") \
+            images/${version}
     fi
 }
 

base/generate_tags.sh

@@ -31,7 +31,7 @@ generate_image()
 
     if [ -d images/$folder ] && [ -z "$FORCE" ]; then
         # Do not erase what we already defined in the directory
-        echo Already defined, skipping Use -f to forcre update
+        echo Already defined, skipping Use -f to force update
         return
     fi
 

prestashop_docker.py

@@ -113,7 +113,7 @@ def main():
             elif args.tag_subcommand == 'build':
                 tag_manager.build(args.version, args.force)
             elif args.tag_subcommand == 'push':
-                tag_manager.push(args.version, args.force)
+                tag_manager.build(args.version, args.force, true)
             elif args.tag_subcommand == 'aliases':
                 tag_manager.get_aliases(args.version)
     else:

prestashop_docker/tag_manager.py

@@ -27,7 +27,7 @@ def __init__(self, docker_api, docker_client, version_manager, cache, quiet):
         self.cache = cache
         self.tags = None
 
-    def build(self, version=None, force=False):
+    def build(self, version=None, force=False, push=False):
         '''
         Build version on the current machine
 
@@ -46,68 +46,33 @@ def build(self, version=None, force=False):
                 # Do not build images that already exists on Docker Hub
                 continue
 
-            log = self.docker_client.api.build(
-                path=str(version_path),
-                tag='prestashop/prestashop:' + version,
-                rm=True,
-                nocache=(not self.cache),
-                decode=True
-            )
-
-            self.stream.display(log)
+            if not shutil.which("docker"):
+                raise RuntimeError("The docker client must be installed")
 
+            tags=["--tag", "prestashop/prestashop:" + version]
             aliases = self.version_manager.get_aliases()
             if version in aliases:
                 for alias in aliases[version]:
-                    print(
-                        'Create tag {}'.format(alias)
-                    )
-                    self.docker_client.api.tag(
-                        'prestashop/prestashop:' + version,
-                        'prestashop/prestashop',
-                        alias
-                    )
-
-    def push(self, version=None, force=False):
-        '''
-        Push version on Docker Hub
-
-        @param version: Optional version you want to build
-        @type version: str
-        '''
-        versions = self.get_versions(version)
-
-        for version in versions.keys():
-            print(
-                'Pushing {}'.format(version)
-            )
-
-            if not force and self.exists(version):
-                continue
-
-            log = self.docker_client.api.push(
-                repository='prestashop/prestashop',
-                tag=version,
-                decode=True,
-                stream=True
-            )
+                    print('Will be aliased as tag {}'.format(alias))
+                    tags = tags + ["--tag", "prestashop/prestashop:" + alias]
+
+            args = []
+            if push:
+                args.append('--push')
+            if not self.cache
+                args.append('--no-cache')
+            
+            cmd_args = ["docker", "buildx", "build",
+                "--platform", "linux/arm/v7,linux/arm64/v8,linux/amd64",
+                "--builder", "container",
+            ] + tags + args + [
+                str(version_path)
+            ]
+
+            log = subprocess.Popen(cmd_args, shell=True, stdout=subprocess.PIPE).stdout.read()
 
             self.stream.display(log)
 
-            aliases = self.version_manager.get_aliases()
-            if version in aliases:
-                for alias in aliases[version]:
-                    print(
-                        'Pushing tag {}'.format(alias)
-                    )
-                    log = self.docker_client.api.push(
-                        repository='prestashop/prestashop',
-                        tag=alias,
-                        decode=True,
-                        stream=True
-                    )
-                    self.stream.display(log)
-
     def exists(self, version):
         '''
         Test if a version is already on Docker Hub