From c3650fe79038165e29de51fd7d0a98ecb551851b Mon Sep 17 00:00:00 2001
From: "Xavier Pillons (MSFT)" <xpillons@microsoft.com>
Date: Tue, 9 Jul 2024 12:47:03 +0200
Subject: [PATCH 1/4] install buildx on agents

---
 .github/workflows/update_selfhost.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/.github/workflows/update_selfhost.yml b/.github/workflows/update_selfhost.yml
index 9f64f85c..8c4fdb78 100644
--- a/.github/workflows/update_selfhost.yml
+++ b/.github/workflows/update_selfhost.yml
@@ -30,6 +30,28 @@ jobs:
       run: |
         docker system prune -a -f
         docker volume prune -f
+    # https://docs.docker.com/engine/install/ubuntu/
+    - name: upgrade docker
+      run: |
+        set -e
+        for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do sudo apt-get remove $pkg; done
+
+        # Add Docker's official GPG key:
+        apt-get update
+        apt-get install ca-certificates curl
+        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 update
+
+        apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+
     - uses: actions/checkout@v4
     - name: Install the toolchain
       run: |

From c0a5e263bb42a6d80b9b2524a3e06683ec65730b Mon Sep 17 00:00:00 2001
From: "Xavier Pillons (MSFT)" <xpillons@microsoft.com>
Date: Tue, 9 Jul 2024 12:50:12 +0200
Subject: [PATCH 2/4] do not erro on apt-remove

---
 .github/workflows/update_selfhost.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update_selfhost.yml b/.github/workflows/update_selfhost.yml
index 8c4fdb78..72f9aec0 100644
--- a/.github/workflows/update_selfhost.yml
+++ b/.github/workflows/update_selfhost.yml
@@ -33,9 +33,10 @@ jobs:
     # https://docs.docker.com/engine/install/ubuntu/
     - name: upgrade docker
       run: |
+        for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do apt-get remove $pkg; done
+        apt autoremove
+  
         set -e
-        for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do sudo apt-get remove $pkg; done
-
         # Add Docker's official GPG key:
         apt-get update
         apt-get install ca-certificates curl

From cc3909bbe7dea13fe038e8a9aef3047ff9c1ae3c Mon Sep 17 00:00:00 2001
From: "Xavier Pillons (MSFT)" <xpillons@microsoft.com>
Date: Tue, 9 Jul 2024 12:52:24 +0200
Subject: [PATCH 3/4] move down docker cleanup

---
 .github/workflows/update_selfhost.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/update_selfhost.yml b/.github/workflows/update_selfhost.yml
index 72f9aec0..fcf12705 100644
--- a/.github/workflows/update_selfhost.yml
+++ b/.github/workflows/update_selfhost.yml
@@ -26,10 +26,6 @@ jobs:
     permissions: {}
 
     steps:
-    - name: Cleanup Docker
-      run: |
-        docker system prune -a -f
-        docker volume prune -f
     # https://docs.docker.com/engine/install/ubuntu/
     - name: upgrade docker
       run: |
@@ -53,6 +49,11 @@ jobs:
 
         apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
 
+    - name: Cleanup Docker
+      run: |
+        docker system prune -a -f
+        docker volume prune -f
+
     - uses: actions/checkout@v4
     - name: Install the toolchain
       run: |

From 579024274a39ecfae749f7395be8e9a4505c3489 Mon Sep 17 00:00:00 2001
From: "Xavier Pillons (MSFT)" <xpillons@microsoft.com>
Date: Tue, 9 Jul 2024 12:53:45 +0200
Subject: [PATCH 4/4] explicitely not failed on apt-remove

---
 .github/workflows/update_selfhost.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/update_selfhost.yml b/.github/workflows/update_selfhost.yml
index fcf12705..3261ef21 100644
--- a/.github/workflows/update_selfhost.yml
+++ b/.github/workflows/update_selfhost.yml
@@ -29,6 +29,7 @@ jobs:
     # https://docs.docker.com/engine/install/ubuntu/
     - name: upgrade docker
       run: |
+        set +e
         for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do apt-get remove $pkg; done
         apt autoremove