[Automated 🤖 ] Bump to version 2.280.1

Merge pull request #133 from joeyparrish/fix-chmod
Fix failing chmod on docker-compose on arm
2021-08-04 12:40:12 -05:00 · 2021-08-04 11:33:42 -05:00 · 2021-08-04 11:31:14 -05:00 · 2021-08-04 09:31:05 -07:00 · 2021-08-04 08:55:21 -07:00 · 2021-08-03 16:42:30 -05:00
2 changed files with 8 additions and 3 deletions
@@ -5,7 +5,7 @@ LABEL maintainer="myoung34@my.apsu.edu"
 ENV AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache
 RUN mkdir -p /opt/hostedtoolcache

-ARG GH_RUNNER_VERSION="2.280.0"
+ARG GH_RUNNER_VERSION="2.280.1"
 ARG TARGETPLATFORM

 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -1,7 +1,12 @@
 FROM ubuntu:focal
 LABEL maintainer="myoung34@my.apsu.edu"

+# TODO: Ubuntu focal (20.04) has git v2.25, but the minimum needed for GitHub
+# Actions runners is v2.29.  For now, we build git from source.  When updating
+# to hirsute (21.04) or later, we can remove the instructions to build from
+# source in favor of the regular Ubuntu git package.
 ARG GIT_VERSION="2.29.0"
+
 ARG DUMB_INIT_VERSION="1.2.2"
 ARG DOCKER_KEY="7EA0A9C3F273FCD8"

@@ -37,6 +42,7 @@ RUN apt-get update && \
    openssh-client \
    locales \
    python3-pip \
+    python2 \
    dumb-init \
  && pip3 install --no-cache-dir awscliv2 \
  && locale-gen en_US.UTF-8 \
@@ -55,7 +61,6 @@ RUN apt-get update && \
  && ( add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/$(lsb_release -is | awk '{print tolower($0)}') $(lsb_release -cs) stable" ) \
  && apt-get update \
  && apt-get install -y docker-ce docker-ce-cli containerd.io --no-install-recommends --allow-unauthenticated \
-  && [[ $(lscpu -J | jq -r '.lscpu[] | select(.field == "Vendor ID:") | .data') == "ARM" ]] && echo "Not installing docker-compose. See https://github.com/docker/compose/issues/6831" || ( curl -sL "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose ) \
-  && chmod +x /usr/local/bin/docker-compose \
+  && [[ $(lscpu -J | jq -r '.lscpu[] | select(.field == "Vendor ID:") | .data') == "ARM" ]] && echo "Not installing docker-compose. See https://github.com/docker/compose/issues/6831" || ( curl -sL "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && chmod +x /usr/local/bin/docker-compose ) \
  && rm -rf /var/lib/apt/lists/* \
  && rm -rf /tmp/*
Author	SHA1	Message	Date
Marcus Young	2991edd770	[Automated 🤖 ] Bump to version 2.280.1	2021-08-04 12:40:12 -05:00
myoung34andGitHub	70cfc22566	Merge pull request #133 from joeyparrish/fix-chmod Fix failing chmod on docker-compose on arm	2021-08-04 11:33:42 -05:00
myoung34andGitHub	00824687a7	Merge pull request #132 from joeyparrish/install-python2 Add python2 to base image	2021-08-04 11:31:14 -05:00
Joey Parrish	746ef939c5	Fix failing chmod on docker-compose on arm Since docker-compose is not downloaded on arm, the chmod command fails there. Moving it inside the previous command, after curl, ensures it only runs when it should.	2021-08-04 09:31:05 -07:00
Joey Parrish	30ff3b9560	Add python2 to base image Since GitHub Actions environments include python2, this improves compatibility for the docker image.	2021-08-04 08:55:21 -07:00
myoung34andGitHub	69daab6ad2	Merge pull request #127 from joeyparrish/comment-git-source-build Add a comment about why git is built from source	2021-08-03 16:42:30 -05:00
Joey Parrish	e60f5986bb	Add a comment about why git is built from source Closes #125	2021-08-03 14:39:46 -07:00