From f734b4bfffbc9c97aa5bef0ad731ec3b22c99c87 Mon Sep 17 00:00:00 2001 From: Amir Szekely Date: Tue, 21 Jun 2022 10:52:28 -0700 Subject: [PATCH] feat: Latest Ubuntu LTS and git version (#51) This change helps us match GitHub cloud runners behavior Fixes #50 --- .../docker-images/codebuild/linux-arm64/Dockerfile | 7 +++++-- src/providers/docker-images/codebuild/linux-x64/Dockerfile | 7 +++++-- src/providers/docker-images/fargate/linux-arm64/Dockerfile | 7 +++++-- src/providers/docker-images/fargate/linux-x64/Dockerfile | 7 +++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/providers/docker-images/codebuild/linux-arm64/Dockerfile b/src/providers/docker-images/codebuild/linux-arm64/Dockerfile index a476e0fc..f9325d1d 100644 --- a/src/providers/docker-images/codebuild/linux-arm64/Dockerfile +++ b/src/providers/docker-images/codebuild/linux-arm64/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE="public.ecr.aws/lts/ubuntu:18.04" +ARG BASE_IMAGE="public.ecr.aws/lts/ubuntu:20.04" FROM $BASE_IMAGE # setup user @@ -6,10 +6,13 @@ RUN addgroup runner && adduser --system --disabled-password --home /home/runner # add dependencies and sudo ARG EXTRA_PACKAGES="" -RUN apt-get update && apt-get upgrade -y && apt-get install -y curl sudo jq bash git zip unzip iptables $EXTRA_PACKAGES && \ +RUN apt-get update && apt-get upgrade -y && apt-get install -y curl sudo jq bash zip unzip iptables software-properties-common $EXTRA_PACKAGES && \ usermod -aG sudo runner && \ echo "%sudo ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/runner +# add latest git +RUN add-apt-repository ppa:git-core/ppa && apt update && apt-get install -y git + # add awscli RUN curl -fsSL "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" -o awscliv2.zip && \ unzip -q awscliv2.zip && ./aws/install && rm -rf awscliv2.zip aws diff --git a/src/providers/docker-images/codebuild/linux-x64/Dockerfile b/src/providers/docker-images/codebuild/linux-x64/Dockerfile index b400fb72..96c799bb 100644 --- a/src/providers/docker-images/codebuild/linux-x64/Dockerfile +++ b/src/providers/docker-images/codebuild/linux-x64/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE="public.ecr.aws/lts/ubuntu:18.04" +ARG BASE_IMAGE="public.ecr.aws/lts/ubuntu:20.04" FROM $BASE_IMAGE # setup user @@ -6,10 +6,13 @@ RUN addgroup runner && adduser --system --disabled-password --home /home/runner # add dependencies and sudo ARG EXTRA_PACKAGES="" -RUN apt-get update && apt-get upgrade -y && apt-get install -y curl sudo jq bash git zip unzip iptables $EXTRA_PACKAGES && \ +RUN apt-get update && apt-get upgrade -y && apt-get install -y curl sudo jq bash zip unzip iptables software-properties-common $EXTRA_PACKAGES && \ usermod -aG sudo runner && \ echo "%sudo ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/runner +# add latest git +RUN add-apt-repository ppa:git-core/ppa && apt update && apt-get install -y git + # add awscli RUN curl -fsSL "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o awscliv2.zip && \ unzip -q awscliv2.zip && ./aws/install && rm -rf awscliv2.zip aws diff --git a/src/providers/docker-images/fargate/linux-arm64/Dockerfile b/src/providers/docker-images/fargate/linux-arm64/Dockerfile index ff419204..56f06651 100644 --- a/src/providers/docker-images/fargate/linux-arm64/Dockerfile +++ b/src/providers/docker-images/fargate/linux-arm64/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE="public.ecr.aws/lts/ubuntu:18.04" +ARG BASE_IMAGE="public.ecr.aws/lts/ubuntu:20.04" FROM $BASE_IMAGE # setup user @@ -6,10 +6,13 @@ RUN addgroup runner && adduser --system --disabled-password --home /home/runner # add dependencies and sudo ARG EXTRA_PACKAGES="" -RUN apt-get update && apt-get upgrade -y && apt-get install -y curl sudo jq bash git zip unzip $EXTRA_PACKAGES && \ +RUN apt-get update && apt-get upgrade -y && apt-get install -y curl sudo jq bash zip unzip software-properties-common $EXTRA_PACKAGES && \ usermod -aG sudo runner && \ echo "%sudo ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/runner +# add latest git +RUN add-apt-repository ppa:git-core/ppa && apt update && apt-get install -y git + # add awscli RUN curl -fsSL "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" -o awscliv2.zip && \ unzip -q awscliv2.zip && ./aws/install && rm -rf awscliv2.zip aws diff --git a/src/providers/docker-images/fargate/linux-x64/Dockerfile b/src/providers/docker-images/fargate/linux-x64/Dockerfile index 6272e391..6db7d73c 100644 --- a/src/providers/docker-images/fargate/linux-x64/Dockerfile +++ b/src/providers/docker-images/fargate/linux-x64/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE="public.ecr.aws/lts/ubuntu:18.04" +ARG BASE_IMAGE="public.ecr.aws/lts/ubuntu:20.04" FROM $BASE_IMAGE # setup user @@ -6,10 +6,13 @@ RUN addgroup runner && adduser --system --disabled-password --home /home/runner # add dependencies and sudo ARG EXTRA_PACKAGES="" -RUN apt-get update && apt-get upgrade -y && apt-get install -y curl sudo jq bash git zip unzip $EXTRA_PACKAGES && \ +RUN apt-get update && apt-get upgrade -y && apt-get install -y curl sudo jq bash zip unzip software-properties-common $EXTRA_PACKAGES && \ usermod -aG sudo runner && \ echo "%sudo ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/runner +# add latest git +RUN add-apt-repository ppa:git-core/ppa && apt update && apt-get install -y git + # add awscli RUN curl -fsSL "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o awscliv2.zip && \ unzip -q awscliv2.zip && ./aws/install && rm -rf awscliv2.zip aws