Skip to content

Commit fa52af0

Browse files
Dylan-AWSDylan-AWS
committed
release corretto8/11 images, move al2:3.0 to unsupported
1 parent 0d9f0ef commit fa52af0

22 files changed

+187
-1
lines changed

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ The following images are actively maintained by AWS CodeBuild, and are listed in
3737
+ [standard 5.0](ubuntu/standard/5.0)
3838
+ [standard 6.0](ubuntu/standard/6.0)
3939
+ [standard 7.0](ubuntu/standard/7.0)
40-
+ [amazonlinux2-x86_64-standard:3.0](al2/x86_64/standard/3.0)
4140
+ [amazonlinux2-x86_64-standard:4.0](al2/x86_64/standard/4.0)
41+
+ [amazonlinux2-x86_64-standard:corretto8](al2/x86_64/standard/corretto8)
42+
+ [amazonlinux2-x86_64-standard:corretto11](al2/x86_64/standard/corretto11)
4243
+ [amazonlinux2-aarch64-standard:2.0](al2/aarch64/standard/2.0)
4344
+ [amazonlinux2-aarch64-standard:3.0](al2/aarch64/standard/3.0)

‎al2/x86_64/standard/corretto11/Dockerfile

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
#
3+
# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the License.
4+
# A copy of the License is located at
5+
#
6+
# http://aws.amazon.com/asl/
7+
#
8+
# or in the "license" file accompanying this file.
9+
# This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied.
10+
# See the License for the specific language governing permissions and limitations under the License.
11+
12+
FROM public.ecr.aws/amazoncorretto/amazoncorretto:11
13+
14+
# Install git, SSH, and other utilities
15+
RUN set -ex \
16+
&& yum update -y \
17+
&& yum install -y -q openssh-clients tar gzip wget unzip perl\
18+
&& mkdir ~/.ssh \
19+
&& mkdir -p /opt/tools \
20+
&& mkdir -p /codebuild/image/config \
21+
&& touch ~/.ssh/known_hosts \
22+
&& ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H github.com >> ~/.ssh/known_hosts \
23+
&& ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H bitbucket.org >> ~/.ssh/known_hosts \
24+
&& chmod 600 ~/.ssh/known_hosts
25+
26+
RUN useradd codebuild-user
27+
28+
ARG MAVEN_HOME="/opt/maven"
29+
ARG MAVEN_VERSION=3.9.1
30+
ARG MAVEN_CONFIG_HOME="/root/.m2"
31+
ARG GRADLE_VERSION=8.1.1
32+
ARG GRADLE_PATH="/usr/local/gradle"
33+
34+
RUN set -ex \
35+
# Install Maven
36+
&& mkdir -p $MAVEN_HOME \
37+
&& curl -LSso /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \
38+
&& tar xzf /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz -C $MAVEN_HOME --strip-components=1 \
39+
&& rm /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz \
40+
&& update-alternatives --install /usr/bin/mvn mvn /opt/maven/bin/mvn 10000 \
41+
&& mkdir -p $MAVEN_CONFIG_HOME \
42+
# Install Gradle
43+
&& mkdir -p $GRADLE_PATH \
44+
&& wget -q "https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-all.zip" -O "$GRADLE_PATH/gradle-$GRADLE_VERSION-all.zip" \
45+
&& unzip -q "$GRADLE_PATH/gradle-$GRADLE_VERSION-all.zip" -d /usr/local \
46+
&& rm "$GRADLE_PATH/gradle-$GRADLE_VERSION-all.zip" \
47+
&& mkdir "/tmp/gradle-$GRADLE_VERSION" \
48+
&& "/usr/local/gradle-$GRADLE_VERSION/bin/gradle" -p "/tmp/gradle-$GRADLE_VERSION" init \
49+
&& "/usr/local/gradle-$GRADLE_VERSION/bin/gradle" -p "/tmp/gradle-$GRADLE_VERSION" wrapper \
50+
&& perl -pi -e "s/gradle-$GRADLE_VERSION-bin.zip/gradle-$GRADLE_VERSION-all.zip/" "/tmp/gradle-$GRADLE_VERSION/gradle/wrapper/gradle-wrapper.properties" \
51+
&& "/tmp/gradle-$GRADLE_VERSION/gradlew" -p "/tmp/gradle-$GRADLE_VERSION" init \
52+
&& rm -rf "/tmp/gradle-$GRADLE_VERSION" \
53+
# Install default GRADLE_VERSION to path
54+
&& ln -s /usr/local/gradle-$GRADLE_VERSION/bin/gradle /usr/bin/gradle \
55+
&& rm -rf $GRADLE_PATH
56+
57+
# Configure SSH
58+
COPY ssh_config /root/.ssh/config
59+
COPY runtimes.yml /codebuild/image/config/runtimes.yml
60+
COPY legal/bill_of_material.txt /usr/share/doc/bill_of_material.txt
61+
62+
ENTRYPOINT ["/bin/bash"]

‎al2/x86_64/standard/corretto11/legal/bill_of_material.txt

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
The Amazon CodeBuild Product includes the following third-party software/licensing:
2+
3+
----------------
4+
gzip : GPLv3+ and GFDL
5+
----------------
6+
openssh-clients : BSD
7+
----------------
8+
perl : Artistic
9+
----------------
10+
tar : GPLv3+
11+
----------------
12+
wget : GPLv3+
13+
----------------
14+
unzip : http://www.info-zip.org/pub/infozip/license.html
15+
----------------
16+
maven : Apache License, Version 2.0
17+
----------------
18+
gradle : Apache License, Version 2.0
19+
----------------

‎al2/x86_64/standard/corretto11/runtimes.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: 0.1
2+
3+
runtimes:
4+
java:
5+
versions:
6+
corretto11:
7+
commands:
8+
- echo "Installing corretto(OpenJDK) version 11 ..."

‎al2/x86_64/standard/3.0/ssh_config renamed to ‎al2/x86_64/standard/corretto11/ssh_config

File renamed without changes.

‎al2/x86_64/standard/corretto8/Dockerfile

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
#
3+
# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the License.
4+
# A copy of the License is located at
5+
#
6+
# http://aws.amazon.com/asl/
7+
#
8+
# or in the "license" file accompanying this file.
9+
# This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied.
10+
# See the License for the specific language governing permissions and limitations under the License.
11+
12+
FROM public.ecr.aws/amazoncorretto/amazoncorretto:8
13+
14+
# Install git, SSH, and other utilities
15+
RUN set -ex \
16+
&& yum update -y \
17+
&& yum install -y -q openssh-clients tar gzip wget unzip perl\
18+
&& mkdir ~/.ssh \
19+
&& mkdir -p /opt/tools \
20+
&& mkdir -p /codebuild/image/config \
21+
&& touch ~/.ssh/known_hosts \
22+
&& ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H github.com >> ~/.ssh/known_hosts \
23+
&& ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H bitbucket.org >> ~/.ssh/known_hosts \
24+
&& chmod 600 ~/.ssh/known_hosts
25+
26+
RUN useradd codebuild-user
27+
28+
ARG MAVEN_HOME="/opt/maven"
29+
ARG MAVEN_VERSION=3.9.1
30+
ARG MAVEN_CONFIG_HOME="/root/.m2"
31+
ARG GRADLE_VERSION=8.1.1
32+
ARG GRADLE_PATH="/usr/local/gradle"
33+
34+
RUN set -ex \
35+
# Install Maven
36+
&& mkdir -p $MAVEN_HOME \
37+
&& curl -LSso /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \
38+
&& tar xzf /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz -C $MAVEN_HOME --strip-components=1 \
39+
&& rm /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz \
40+
&& update-alternatives --install /usr/bin/mvn mvn /opt/maven/bin/mvn 10000 \
41+
&& mkdir -p $MAVEN_CONFIG_HOME \
42+
# Install Gradle
43+
&& mkdir -p $GRADLE_PATH \
44+
&& wget -q "https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-all.zip" -O "$GRADLE_PATH/gradle-$GRADLE_VERSION-all.zip" \
45+
&& unzip -q "$GRADLE_PATH/gradle-$GRADLE_VERSION-all.zip" -d /usr/local \
46+
&& rm "$GRADLE_PATH/gradle-$GRADLE_VERSION-all.zip" \
47+
&& mkdir "/tmp/gradle-$GRADLE_VERSION" \
48+
&& "/usr/local/gradle-$GRADLE_VERSION/bin/gradle" -p "/tmp/gradle-$GRADLE_VERSION" init \
49+
&& "/usr/local/gradle-$GRADLE_VERSION/bin/gradle" -p "/tmp/gradle-$GRADLE_VERSION" wrapper \
50+
&& perl -pi -e "s/gradle-$GRADLE_VERSION-bin.zip/gradle-$GRADLE_VERSION-all.zip/" "/tmp/gradle-$GRADLE_VERSION/gradle/wrapper/gradle-wrapper.properties" \
51+
&& "/tmp/gradle-$GRADLE_VERSION/gradlew" -p "/tmp/gradle-$GRADLE_VERSION" init \
52+
&& rm -rf "/tmp/gradle-$GRADLE_VERSION" \
53+
# Install default GRADLE_VERSION to path
54+
&& ln -s /usr/local/gradle-$GRADLE_VERSION/bin/gradle /usr/bin/gradle \
55+
&& rm -rf $GRADLE_PATH
56+
57+
# Configure SSH
58+
COPY ssh_config /root/.ssh/config
59+
COPY runtimes.yml /codebuild/image/config/runtimes.yml
60+
COPY legal/bill_of_material.txt /usr/share/doc/bill_of_material.txt
61+
62+
ENTRYPOINT ["/bin/bash"]

‎al2/x86_64/standard/corretto8/legal/bill_of_material.txt

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
The Amazon CodeBuild Product includes the following third-party software/licensing:
2+
3+
----------------
4+
gzip : GPLv3+ and GFDL
5+
----------------
6+
openssh-clients : BSD
7+
----------------
8+
perl : Artistic
9+
----------------
10+
tar : GPLv3+
11+
----------------
12+
wget : GPLv3+
13+
----------------
14+
unzip : http://www.info-zip.org/pub/infozip/license.html
15+
----------------
16+
maven : Apache License, Version 2.0
17+
----------------
18+
gradle : Apache License, Version 2.0
19+
----------------

‎al2/x86_64/standard/corretto8/runtimes.yml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version: 0.1
2+
3+
runtimes:
4+
java:
5+
versions:
6+
corretto8:
7+
commands:
8+
- echo "Installing corretto(OpenJDK) version 8 ..."
9+

‎al2/x86_64/standard/corretto8/ssh_config

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Host *
2+
ConnectTimeout 10
3+
ConnectionAttempts 10

‎al2/x86_64/standard/3.0/Dockerfile renamed to ‎unsupported_images/al2/x86_64/standard/3.0/Dockerfile

File renamed without changes.

‎al2/x86_64/standard/3.0/amazon-ssm-agent.json renamed to ‎unsupported_images/al2/x86_64/standard/3.0/amazon-ssm-agent.json

File renamed without changes.

‎al2/x86_64/standard/3.0/dockerd-entrypoint.sh renamed to ‎unsupported_images/al2/x86_64/standard/3.0/dockerd-entrypoint.sh

File renamed without changes.

‎al2/x86_64/standard/3.0/legal/THIRD_PARTY_LICENSES.txt renamed to ‎unsupported_images/al2/x86_64/standard/3.0/legal/THIRD_PARTY_LICENSES.txt

File renamed without changes.

‎al2/x86_64/standard/3.0/legal/bill_of_material.txt renamed to ‎unsupported_images/al2/x86_64/standard/3.0/legal/bill_of_material.txt

File renamed without changes.

‎al2/x86_64/standard/3.0/runtimes.yml renamed to ‎unsupported_images/al2/x86_64/standard/3.0/runtimes.yml

File renamed without changes.

‎unsupported_images/al2/x86_64/standard/3.0/ssh_config

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Host *
2+
ConnectTimeout 10
3+
ConnectionAttempts 10

‎al2/x86_64/standard/3.0/tools/android-accept-licenses.sh renamed to ‎unsupported_images/al2/x86_64/standard/3.0/tools/android-accept-licenses.sh

File renamed without changes.

‎al2/x86_64/standard/3.0/tools/runtime_configs/php/7.3.33 renamed to ‎unsupported_images/al2/x86_64/standard/3.0/tools/runtime_configs/php/7.3.33

File renamed without changes.

‎al2/x86_64/standard/3.0/tools/runtime_configs/php/7.4.33 renamed to ‎unsupported_images/al2/x86_64/standard/3.0/tools/runtime_configs/php/7.4.33

File renamed without changes.

‎al2/x86_64/standard/3.0/tools/runtime_configs/python/3.7.13 renamed to ‎unsupported_images/al2/x86_64/standard/3.0/tools/runtime_configs/python/3.7.13

File renamed without changes.

‎al2/x86_64/standard/3.0/tools/runtime_configs/python/3.8.13 renamed to ‎unsupported_images/al2/x86_64/standard/3.0/tools/runtime_configs/python/3.8.13

File renamed without changes.

‎al2/x86_64/standard/3.0/tools/runtime_configs/python/3.9.16 renamed to ‎unsupported_images/al2/x86_64/standard/3.0/tools/runtime_configs/python/3.9.16

File renamed without changes.

0 commit comments

Comments
 (0)