diff --git a/Dockerfile b/Dockerfile index 3529da2..2cc16c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,6 @@ RUN sudo mkdir /opt/hostedtoolcache \ && sudo chown runner:docker /opt/hostedtoolcache COPY entrypoint.sh / -COPY entrypoint.d/ /entrypoint.d/ VOLUME /var/lib/docker diff --git a/Dockerfile.ubuntu20 b/Dockerfile.ubuntu20 index 3542777..bc5362c 100644 --- a/Dockerfile.ubuntu20 +++ b/Dockerfile.ubuntu20 @@ -68,7 +68,6 @@ RUN mkdir /opt/hostedtoolcache \ && chown runner:docker /opt/hostedtoolcache COPY entrypoint.sh / -COPY entrypoint.d/ /entrypoint.d/ VOLUME /var/lib/docker diff --git a/entrypoint.d/modify-apt-sources-aws-jammy-aarch64.sh b/entrypoint.d/modify-apt-sources-aws-jammy-aarch64.sh deleted file mode 100644 index c02f88b..0000000 --- a/entrypoint.d/modify-apt-sources-aws-jammy-aarch64.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -set -eu -o pipefail -aws_availability_zone="$1" -echo "Modifying /etc/apt/sources.list for jammy aarch64 on AWS ${aws_availability_zone}" >&2 -cat > /etc/apt/sources.list <&2 -cat > /etc/apt/sources.list <&2 - -if [[ -n "$aws_imds_token" && $ubuntu_release == jammy && $platform == x86_64 ]]; then - bash /entrypoint.d/modify-apt-sources-aws-jammy-x86_64.sh "$(get_aws_region)" -elif [[ -n "$aws_imds_token" && $ubuntu_release == jammy && $platform == aarch64 ]]; then - bash /entrypoint.d/modify-apt-sources-aws-jammy-aarch64.sh "$(get_aws_availability_zone)" -fi diff --git a/entrypoint.sh b/entrypoint.sh index 7c7d79e..3740361 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,3 @@ #!/bin/bash -sudo bash /entrypoint.d/modify-apt-sources.sh sudo /usr/bin/dockerd --log-level warn & exec "$@"