Merge pull request #2155 from vvbandeira/fix-docker

ci: fix docker build

Author: vvbandeira

etc/DependencyInstaller.sh

@@ -122,15 +122,23 @@ _installCI() {
         python3 \
         software-properties-common
 
-    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-    echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
-        $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+    # Add Docker's official GPG key:
+    install -m 0755 -d /etc/apt/keyrings
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg \
+        -o /etc/apt/keyrings/docker.asc
+    chmod a+r /etc/apt/keyrings/docker.asc
+
+    # Add the repository to Apt sources:
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+        $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+        tee /etc/apt/sources.list.d/docker.list > /dev/null
 
     apt-get -y update
     apt-get -y install --no-install-recommends \
         docker-ce \
         docker-ce-cli \
-        containerd.io
+        containerd.io \
+        docker-buildx-plugin \
 
 }
 

etc/DockerHelper.sh

@@ -81,7 +81,7 @@ _setup() {
 
 _create() {
     echo "Create docker image ${imagePath} using ${file}"
-    ${DOCKER_CMD} build \
+    ${DOCKER_CMD} buildx build \
         --file "${file}" \
         --tag "${imagePath}" \
         ${buildArgs} \

etc/DockerTag.sh

@@ -9,10 +9,13 @@ if [[ "$@" == "-dev" ]]; then
         "./docker/Dockerfile.dev"
         "./etc/DependencyInstaller.sh"
         "./etc/DockerHelper.sh"
+        "./etc/DockerTag.sh"
+        "./tools/OpenROAD/docker/Dockerfile.binary"
         "./tools/OpenROAD/docker/Dockerfile.builder"
         "./tools/OpenROAD/docker/Dockerfile.dev"
-        "./tools/OpenROAD/docker/Dockerfile.binary"
         "./tools/OpenROAD/etc/DependencyInstaller.sh"
+        "./tools/OpenROAD/etc/DockerHelper.sh"
+        "./tools/OpenROAD/etc/DockerTag.sh"
     )
     cat "${file_list[@]}" | sha256sum | awk '{print substr($1, 1, 6)}'
 elif [[ "$@" == "-master" ]]; then