You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2022/01/20 18:46:08 UTC
[airflow-ci-infra] branch add-docker-buildx-plugin updated (3ec060d -> 9b27170)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a change to branch add-docker-buildx-plugin
in repository https://gitbox.apache.org/repos/asf/airflow-ci-infra.git.
discard 3ec060d Add Docker Buildx plugin
new 9b27170 Add Docker Buildx plugin
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (3ec060d)
\
N -- N -- N refs/heads/add-docker-buildx-plugin (9b27170)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
github-runner-ami/packer/ubuntu2004.pkr.hcl | 2 +-
github-runner-ami/packer/vars/variables.pkrvars.hcl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[airflow-ci-infra] 01/01: Add Docker Buildx plugin
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch add-docker-buildx-plugin
in repository https://gitbox.apache.org/repos/asf/airflow-ci-infra.git
commit 9b271700966eebd735888a2b58849ef08c126ae3
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Thu Jan 20 19:42:47 2022 +0100
Add Docker Buildx plugin
---
.gitignore | 2 ++
.../{vars/variables.pkrvars.hcl => files/docker-buildx.sh} | 11 ++++-------
github-runner-ami/packer/ubuntu2004.pkr.hcl | 2 +-
github-runner-ami/packer/vars/variables.pkrvars.hcl | 2 +-
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/.gitignore b/.gitignore
index f9f8225..27d454c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,5 @@ override.tf.json
session-manager-plugin.*
# End of https://www.toptal.com/developers/gitignore/api/terraform
+github-runner-ami/packer/session-manager-plugin.deb
+github-runner-ami/packer/session-manager-plugin.rpm
diff --git a/github-runner-ami/packer/vars/variables.pkrvars.hcl b/github-runner-ami/packer/files/docker-buildx.sh
similarity index 74%
copy from github-runner-ami/packer/vars/variables.pkrvars.hcl
copy to github-runner-ami/packer/files/docker-buildx.sh
index 5356f0b..866bbb4 100644
--- a/github-runner-ami/packer/vars/variables.pkrvars.hcl
+++ b/github-runner-ami/packer/files/docker-buildx.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -14,10 +15,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-vpc_id = "vpc-d73487bd"
-ami_name = "airflow-runner-ami"
-aws_regions = ["eu-central-1", "us-east-2"]
-packer_role_arn = "arn:aws:iam::827901512104:role/packer-role"
-runner_version = "2.286.1-airflow1"
-session_manager_instance_profile_name = "packer_ssm_instance_profile"
+set -exu -o pipefail
+# Hard-code docker buildx 0.7.1
+curl -L "https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.$(uname -s)-$(uname -m)" -o "${HOME}/.docker/cli-plugins"
diff --git a/github-runner-ami/packer/ubuntu2004.pkr.hcl b/github-runner-ami/packer/ubuntu2004.pkr.hcl
index 152afd6..5dab557 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}-v4"
+ ami_name = "${var.ami_name}-${var.runner_version}"
ami_regions = var.aws_regions
tag {
key = "Name"
diff --git a/github-runner-ami/packer/vars/variables.pkrvars.hcl b/github-runner-ami/packer/vars/variables.pkrvars.hcl
index 5356f0b..01d6ed9 100644
--- a/github-runner-ami/packer/vars/variables.pkrvars.hcl
+++ b/github-runner-ami/packer/vars/variables.pkrvars.hcl
@@ -19,5 +19,5 @@ vpc_id = "vpc-d73487bd"
ami_name = "airflow-runner-ami"
aws_regions = ["eu-central-1", "us-east-2"]
packer_role_arn = "arn:aws:iam::827901512104:role/packer-role"
-runner_version = "2.286.1-airflow1"
+runner_version = "2.286.1-airflow"
session_manager_instance_profile_name = "packer_ssm_instance_profile"