[airflow-ci-infra] branch main updated: Bring back autossh removed accidentally (and skip docker.io)

[potiuk]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow-ci-infra.git


The following commit(s) were added to refs/heads/main by this push:
     new 5029d17  Bring back autossh removed accidentally (and skip docker.io)
5029d17 is described below

commit 5029d17cf220d56d04471ef71c51e8cdad99f300
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Wed Aug 23 14:29:50 2023 +0200

    Bring back autossh removed accidentally (and skip docker.io)
    
    The previous changes removed autossh by accident when we switched
    to a new version of docker. This PR brings it back and also
    removes docker.io initial installation - which is not needed
    as we remove it later anyway and install the latest version
    directly from Docker repositories.
---
 github-runner-ami/packer/files/install-dependencies.sh | 2 +-
 github-runner-ami/packer/ubuntu2004.pkr.hcl            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/github-runner-ami/packer/files/install-dependencies.sh 
b/github-runner-ami/packer/files/install-dependencies.sh
index ba40d65..9d24d99 100644
--- a/github-runner-ami/packer/files/install-dependencies.sh
+++ b/github-runner-ami/packer/files/install-dependencies.sh
@@ -30,7 +30,7 @@ apt-get update
 apt-get install -yq --no-install-recommends -o 
Dpkg::Options::="--force-confold" \
             awscli \
             build-essential \
-            docker.io \
+            autossh \
             git \
             haveged \
             iptables-persistent \
diff --git a/github-runner-ami/packer/ubuntu2004.pkr.hcl 
b/github-runner-ami/packer/ubuntu2004.pkr.hcl
index 4b0e6ca..6b1f49c 100644
--- a/github-runner-ami/packer/ubuntu2004.pkr.hcl
+++ b/github-runner-ami/packer/ubuntu2004.pkr.hcl
@@ -38,7 +38,7 @@ source "amazon-ebs" "runner_builder" {
   #access_key = ""
   #secret_key = ""
   region = var.aws_regions[0]
-  ami_name = "${var.ami_name}-${var.runner_version}-v16"
+  ami_name = "${var.ami_name}-${var.runner_version}-v17"
   ami_regions = var.aws_regions
   tag {
     key   = "Name"