Merge pull request #621 from Dylan-AWS/master

Release ubuntu 7.0, move ubuntu 4.0 and al2/aarch64 1.0 to unsupporte…

Author: awszhen

README.md

@@ -8,24 +8,24 @@ The master branch will sometimes have changes that are still in the process of b
 
 ### How to build Docker images
 
-Steps to build Standard 6.0 image
+Steps to build Standard 7.0 image
 
 * Run `git clone https://github.com/aws/aws-codebuild-docker-images.git` to download this repository to your local machine
-* Run `cd aws-codebuild-docker-images/ubuntu/standard/6.0` to change the directory in your local workspace. This is the location of the Standard 6.0 Dockerfile with Ubuntu base.
-* Run `docker build -t aws/codebuild/standard:6.0 .` to build Docker image locally
+* Run `cd aws-codebuild-docker-images/ubuntu/standard/7.0` to change the directory in your local workspace. This is the location of the Standard 7.0 Dockerfile with Ubuntu base.
+* Run `docker build -t aws/codebuild/standard:7.0 .` to build Docker image locally
 
 To poke around in the image interactively, build it and run:
-`docker run -it --entrypoint sh aws/codebuild/standard:6.0 -c bash`
+`docker run -it --entrypoint sh aws/codebuild/standard:7.0 -c bash`
 
 To let the Docker daemon start up in the container, build it and run:
-`docker run -it --privileged aws/codebuild/standard:6.0 bash`
+`docker run -it --privileged aws/codebuild/standard:7.0 bash`
 
 ```
 $ git clone https://github.com/aws/aws-codebuild-docker-images.git
 $ cd aws-codebuild-docker-images
-$ cd ubuntu/standard/6.0
-$ docker build -t aws/codebuild/standard:6.0 .
-$ docker run -it --entrypoint sh aws/codebuild/standard:6.0 -c bash
+$ cd ubuntu/standard/7.0
+$ docker build -t aws/codebuild/standard:7.0 .
+$ docker run -it --entrypoint sh aws/codebuild/standard:7.0 -c bash
 ```
 
 ### Image maintenance
@@ -34,10 +34,9 @@ Some of the images in this repository are no longer actively maintained by AWS C
 
 The following images are actively maintained by AWS CodeBuild, and are listed in the CodeBuild console.
 
-+ [standard 4.0](ubuntu/standard/4.0)
 + [standard 5.0](ubuntu/standard/5.0)
 + [standard 6.0](ubuntu/standard/6.0)
++ [standard 7.0](ubuntu/standard/7.0)
 + [amazonlinux2-x86_64-standard:3.0](al2/x86_64/standard/3.0)
 + [amazonlinux2-x86_64-standard:4.0](al2/x86_64/standard/4.0)
-+ [amazonlinux2-aarch64-standard:1.0](al2/aarch64/standard/1.0)
 + [amazonlinux2-aarch64-standard:2.0](al2/aarch64/standard/2.0)

al2/x86_64/standard/3.0/Dockerfile

@@ -18,8 +18,8 @@ RUN set -ex \
     && mkdir -p /opt/tools \
     && mkdir -p /codebuild/image/config \
     && touch ~/.ssh/known_hosts \
-    && ssh-keyscan -t rsa,dsa -H github.com >> ~/.ssh/known_hosts \
-    && ssh-keyscan -t rsa,dsa -H bitbucket.org >> ~/.ssh/known_hosts \
+    && ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H github.com >> ~/.ssh/known_hosts \
+    && ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H bitbucket.org >> ~/.ssh/known_hosts \
     && chmod 600 ~/.ssh/known_hosts \
     && amazon-linux-extras install epel -y \
     && rpm --import https://download.mono-project.com/repo/xamarin.gpg \

al2/x86_64/standard/4.0/Dockerfile

@@ -18,8 +18,8 @@ RUN set -ex \
     && mkdir -p /opt/tools \
     && mkdir -p /codebuild/image/config \
     && touch ~/.ssh/known_hosts \
-    && ssh-keyscan -t rsa,dsa -H github.com >> ~/.ssh/known_hosts \
-    && ssh-keyscan -t rsa,dsa -H bitbucket.org >> ~/.ssh/known_hosts \
+    && ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H github.com >> ~/.ssh/known_hosts \
+    && ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H bitbucket.org >> ~/.ssh/known_hosts \
     && chmod 600 ~/.ssh/known_hosts \
     && amazon-linux-extras install epel -y \
     && rpm --import https://download.mono-project.com/repo/xamarin.gpg \

buildspec.yml

@@ -3,7 +3,7 @@ version: 0.2
 phases:
   build:
     commands:
-      - cd $CODEBUILD_SRC_DIR/ubuntu/standard/6.0
-      - docker build -t aws/codebuild/standard:6.0 .
+      - cd $CODEBUILD_SRC_DIR/ubuntu/standard/7.0
+      - docker build -t aws/codebuild/standard:7.0 .
       - cd $CODEBUILD_SRC_DIR/al2/x86_64/standard/4.0
       - docker build -t aws/codebuild/amazonlinux2-x86_64-standard:4.0 .

ubuntu/standard/5.0/Dockerfile

@@ -27,8 +27,8 @@ RUN set -ex \
     && mkdir ~/.ssh \
     && mkdir -p /codebuild/image/config \
     && touch ~/.ssh/known_hosts \
-    && ssh-keyscan -t rsa,dsa -H github.com >> ~/.ssh/known_hosts \
-    && ssh-keyscan -t rsa,dsa -H bitbucket.org >> ~/.ssh/known_hosts \
+    && ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H github.com >> ~/.ssh/known_hosts \
+    && ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H bitbucket.org >> ~/.ssh/known_hosts \
     && chmod 600 ~/.ssh/known_hosts \
     && apt-get install -y -qq --no-install-recommends \
           apt-utils asciidoc autoconf automake build-essential bzip2 \

ubuntu/standard/6.0/Dockerfile

@@ -27,8 +27,8 @@ RUN set -ex \
     && mkdir ~/.ssh \
     && mkdir -p /codebuild/image/config \
     && touch ~/.ssh/known_hosts \
-    && ssh-keyscan -t rsa,dsa -H github.com >> ~/.ssh/known_hosts \
-    && ssh-keyscan -t rsa,dsa -H bitbucket.org >> ~/.ssh/known_hosts \
+    && ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H github.com >> ~/.ssh/known_hosts \
+    && ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H bitbucket.org >> ~/.ssh/known_hosts \
     && chmod 600 ~/.ssh/known_hosts \
     && apt-get install -y -qq --no-install-recommends \
           apt-utils asciidoc autoconf automake build-essential bzip2 \