Rebase mos docker images from Bionic to Jammy

Makefile

@@ -111,7 +111,7 @@ docker-build-%:
 	  -e HOME=/tmp \
 	  -e GOBIN=/src/go/bin/$* \
 	  -e GOCACHE=/src/go/.cache \
-	  docker.io/mgos/ubuntu-golang:bionic \
+	  docker.io/mgos/ubuntu-golang:jammy \
 	    make -C /src $* OUT=tools/docker/$*/$*
 	  $(MAKE) -C tools/docker/$* docker-build NOBUILD=1 TAG=$(TAG)
 

tools/docker/fwbuild-instance/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 RUN apt-get update && apt-get install -y zip unzip && apt-get clean
 ADD fwbuild-instance /usr/local/bin
 ENTRYPOINT ["/usr/local/bin/fwbuild-instance"]

tools/docker/fwbuild-manager/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 RUN echo '{}' > /root/.dockercfg
 ADD fwbuild-manager /usr/local/bin
 ENTRYPOINT ["/usr/local/bin/fwbuild-manager"]

tools/docker/mos/Dockerfile

@@ -1,12 +1,13 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 
-# https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/
+# https://docs.docker.com/engine/install/ubuntu/#install-using-the-repository
 RUN apt-get update && \
-    apt-get -y install apt-transport-https ca-certificates curl software-properties-common && \
-    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && apt-key fingerprint 0EBFCD88 && \
-    add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" && \
+    apt-get -y install ca-certificates curl gnupg lsb-release && \
+    mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list && \
     apt-get update && \
-    apt-get -y install docker-ce git libftdi1-2 libusb-1.0-0 && \
+    apt-get -y install docker-ce docker-ce-cli git libftdi1-2 libusb-1.0-0 && \
     apt-get clean
 
 ADD mos /usr/local/bin