Skip to content

Commit

Permalink
feat: Latest Ubuntu LTS and git version (#51)
Browse files Browse the repository at this point in the history
This change helps us match GitHub cloud runners behavior

Fixes #50
  • Loading branch information
kichik committed Jun 21, 2022
1 parent 25d536a commit f734b4b
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 8 deletions.
7 changes: 5 additions & 2 deletions src/providers/docker-images/codebuild/linux-arm64/Dockerfile
@@ -1,15 +1,18 @@
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
RUN addgroup runner && adduser --system --disabled-password --home /home/runner --ingroup runner 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
Expand Down
7 changes: 5 additions & 2 deletions src/providers/docker-images/codebuild/linux-x64/Dockerfile
@@ -1,15 +1,18 @@
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
RUN addgroup runner && adduser --system --disabled-password --home /home/runner --ingroup runner 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
Expand Down
7 changes: 5 additions & 2 deletions src/providers/docker-images/fargate/linux-arm64/Dockerfile
@@ -1,15 +1,18 @@
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
RUN addgroup runner && adduser --system --disabled-password --home /home/runner --ingroup runner 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
Expand Down
7 changes: 5 additions & 2 deletions src/providers/docker-images/fargate/linux-x64/Dockerfile
@@ -1,15 +1,18 @@
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
RUN addgroup runner && adduser --system --disabled-password --home /home/runner --ingroup runner 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
Expand Down

0 comments on commit f734b4b

Please sign in to comment.