From 629ffca6a88d59428354a4bc41eb4ca524dbcbcb Mon Sep 17 00:00:00 2001 From: Ichinose Shogo Date: Fri, 13 Mar 2020 19:06:41 +0900 Subject: [PATCH] use virtual-hosted style url instead of path-style MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As you know, path-style S3 url is now deprecated. So, we should use virtual-hosted style url instead of it. ref. [Amazon S3 Path Deprecation Plan – The Rest of the Story](https://aws.amazon.com/jp/blogs/aws/amazon-s3-path-deprecation-plan-the-rest-of-the-story/) The document for [Installing the Amazon ECS CLI](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI_installation.html) is alread updated, and uses virtual-hosted style url now. > For Linux systems: > sudo curl -o /usr/local/bin/ecs-cli https://amazon-ecs-cli.s3.amazonaws.com/ecs-cli-linux-amd64-latest --- al2/aarch64/standard/1.0/Dockerfile | 2 +- al2/x86_64/standard/1.0/Dockerfile | 2 +- al2/x86_64/standard/2.0/Dockerfile | 2 +- al2/x86_64/standard/3.0/Dockerfile | 4 ++-- ubuntu/standard/1.0/Dockerfile | 2 +- ubuntu/standard/2.0/Dockerfile | 2 +- ubuntu/standard/3.0/Dockerfile | 2 +- ubuntu/standard/4.0/Dockerfile | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/al2/aarch64/standard/1.0/Dockerfile b/al2/aarch64/standard/1.0/Dockerfile index c537cd86..6e0a93a8 100644 --- a/al2/aarch64/standard/1.0/Dockerfile +++ b/al2/aarch64/standard/1.0/Dockerfile @@ -99,7 +99,7 @@ RUN set -ex \ # https://docs.aws.amazon.com/eks/latest/userguide/install-aws-iam-authenticator.html https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI_installation.html RUN curl -sS -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/aws-iam-authenticator \ && curl -sS -o /usr/local/bin/kubectl https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/kubectl \ - && curl -sS -o /usr/local/bin/ecs-cli https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-latest \ + && curl -sS -o /usr/local/bin/ecs-cli https://amazon-ecs-cli.s3.amazonaws.com/ecs-cli-linux-amd64-latest \ && chmod +x /usr/local/bin/kubectl /usr/local/bin/aws-iam-authenticator /usr/local/bin/ecs-cli VOLUME /var/lib/docker diff --git a/al2/x86_64/standard/1.0/Dockerfile b/al2/x86_64/standard/1.0/Dockerfile index d9db07a1..8a1cd200 100644 --- a/al2/x86_64/standard/1.0/Dockerfile +++ b/al2/x86_64/standard/1.0/Dockerfile @@ -88,7 +88,7 @@ RUN set -ex \ # https://docs.aws.amazon.com/eks/latest/userguide/install-aws-iam-authenticator.html https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI_installation.html RUN curl -sS -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/aws-iam-authenticator \ && curl -sS -o /usr/local/bin/kubectl https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/kubectl \ - && curl -sS -o /usr/local/bin/ecs-cli https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-latest \ + && curl -sS -o /usr/local/bin/ecs-cli https://amazon-ecs-cli.s3.amazonaws.com/ecs-cli-linux-amd64-latest \ && chmod +x /usr/local/bin/kubectl /usr/local/bin/aws-iam-authenticator /usr/local/bin/ecs-cli VOLUME /var/lib/docker diff --git a/al2/x86_64/standard/2.0/Dockerfile b/al2/x86_64/standard/2.0/Dockerfile index bc72e4f0..a5b10849 100644 --- a/al2/x86_64/standard/2.0/Dockerfile +++ b/al2/x86_64/standard/2.0/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ # https://docs.aws.amazon.com/eks/latest/userguide/install-aws-iam-authenticator.html https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI_installation.html RUN curl -sS -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/aws-iam-authenticator \ && curl -sS -o /usr/local/bin/kubectl https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/kubectl \ - && curl -sS -o /usr/local/bin/ecs-cli https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-latest \ + && curl -sS -o /usr/local/bin/ecs-cli https://amazon-ecs-cli.s3.amazonaws.com/ecs-cli-linux-amd64-latest \ && chmod +x /usr/local/bin/kubectl /usr/local/bin/aws-iam-authenticator /usr/local/bin/ecs-cli VOLUME /var/lib/docker diff --git a/al2/x86_64/standard/3.0/Dockerfile b/al2/x86_64/standard/3.0/Dockerfile index 95cf867e..bd09147d 100644 --- a/al2/x86_64/standard/3.0/Dockerfile +++ b/al2/x86_64/standard/3.0/Dockerfile @@ -116,12 +116,12 @@ RUN set -ex \ # https://docs.aws.amazon.com/eks/latest/userguide/install-aws-iam-authenticator.html https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI_installation.html RUN curl -sS -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/1.14.6/2019-08-22/bin/linux/amd64/aws-iam-authenticator \ && curl -sS -o /usr/local/bin/kubectl https://amazon-eks.s3-us-west-2.amazonaws.com/1.14.6/2019-08-22/bin/linux/amd64/kubectl \ - && curl -sS -o /usr/local/bin/ecs-cli https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-latest \ + && curl -sS -o /usr/local/bin/ecs-cli https://amazon-ecs-cli.s3.amazonaws.com/ecs-cli-linux-amd64-latest \ && chmod +x /usr/local/bin/kubectl /usr/local/bin/aws-iam-authenticator /usr/local/bin/ecs-cli # Configure SSM RUN set -ex \ - && yum install -y https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm + && yum install -y https://ec2-downloads-windows.s3.amazonaws.com/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm # Install env tools for runtimes ## Dotnet diff --git a/ubuntu/standard/1.0/Dockerfile b/ubuntu/standard/1.0/Dockerfile index 5be0f80b..b9d0996c 100644 --- a/ubuntu/standard/1.0/Dockerfile +++ b/ubuntu/standard/1.0/Dockerfile @@ -104,7 +104,7 @@ RUN set -ex \ # https://docs.aws.amazon.com/eks/latest/userguide/install-aws-iam-authenticator.html https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI_installation.html RUN curl -sS -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/aws-iam-authenticator \ && curl -sS -o /usr/local/bin/kubectl https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/kubectl \ - && curl -sS -o /usr/local/bin/ecs-cli https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-latest \ + && curl -sS -o /usr/local/bin/ecs-cli https://amazon-ecs-cli.s3.amazonaws.com/ecs-cli-linux-amd64-latest \ && chmod +x /usr/local/bin/kubectl /usr/local/bin/aws-iam-authenticator /usr/local/bin/ecs-cli RUN set -ex \ diff --git a/ubuntu/standard/2.0/Dockerfile b/ubuntu/standard/2.0/Dockerfile index e92e4087..5e9e5906 100755 --- a/ubuntu/standard/2.0/Dockerfile +++ b/ubuntu/standard/2.0/Dockerfile @@ -109,7 +109,7 @@ RUN set -ex \ # https://docs.aws.amazon.com/eks/latest/userguide/install-aws-iam-authenticator.html https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI_installation.html RUN curl -sS -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/aws-iam-authenticator \ && curl -sS -o /usr/local/bin/kubectl https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/kubectl \ - && curl -sS -o /usr/local/bin/ecs-cli https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-latest \ + && curl -sS -o /usr/local/bin/ecs-cli https://amazon-ecs-cli.s3.amazonaws.com/ecs-cli-linux-amd64-latest \ && chmod +x /usr/local/bin/kubectl /usr/local/bin/aws-iam-authenticator /usr/local/bin/ecs-cli RUN set -ex \ diff --git a/ubuntu/standard/3.0/Dockerfile b/ubuntu/standard/3.0/Dockerfile index c4da34ba..f5ab0ea9 100644 --- a/ubuntu/standard/3.0/Dockerfile +++ b/ubuntu/standard/3.0/Dockerfile @@ -98,7 +98,7 @@ RUN set -ex \ # https://docs.aws.amazon.com/eks/latest/userguide/install-aws-iam-authenticator.html https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI_installation.html RUN curl -sS -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/aws-iam-authenticator \ && curl -sS -o /usr/local/bin/kubectl https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/kubectl \ - && curl -sS -o /usr/local/bin/ecs-cli https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-latest \ + && curl -sS -o /usr/local/bin/ecs-cli https://amazon-ecs-cli.s3.amazonaws.com/ecs-cli-linux-amd64-latest \ && chmod +x /usr/local/bin/kubectl /usr/local/bin/aws-iam-authenticator /usr/local/bin/ecs-cli RUN set -ex \ diff --git a/ubuntu/standard/4.0/Dockerfile b/ubuntu/standard/4.0/Dockerfile index fea789e9..029d9553 100644 --- a/ubuntu/standard/4.0/Dockerfile +++ b/ubuntu/standard/4.0/Dockerfile @@ -120,14 +120,14 @@ RUN set -ex \ # https://docs.aws.amazon.com/eks/latest/userguide/install-aws-iam-authenticator.html https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI_installation.html RUN curl -sS -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/1.14.6/2019-08-22/bin/linux/amd64/aws-iam-authenticator \ && curl -sS -o /usr/local/bin/kubectl https://amazon-eks.s3-us-west-2.amazonaws.com/1.14.6/2019-08-22/bin/linux/amd64/kubectl \ - && curl -sS -o /usr/local/bin/ecs-cli https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-latest \ + && curl -sS -o /usr/local/bin/ecs-cli https://amazon-ecs-cli.s3.amazonaws.com/ecs-cli-linux-amd64-latest \ && chmod +x /usr/local/bin/kubectl /usr/local/bin/aws-iam-authenticator /usr/local/bin/ecs-cli # Configure SSM RUN set -ex \ && mkdir /tmp/ssm \ && cd /tmp/ssm \ - && wget https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/debian_amd64/amazon-ssm-agent.deb \ + && wget https://ec2-downloads-windows.s3.amazonaws.com/SSMAgent/latest/debian_amd64/amazon-ssm-agent.deb \ && dpkg -i amazon-ssm-agent.deb # Install env tools for runtimes