Skip to content

Commit e914e57

Browse files
authored
Merge pull request #316 from aws/20.03.13
Add new image versions: Standard 4.0, AL2 3.0
2 parents 2ed5955 + 8c73f0b commit e914e57

29 files changed

+1689
-0
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ The following images are actively maintained by AWS CodeBuild, and are listed in
3636

3737
+ [standard 2.0](ubuntu/standard/2.0)
3838
+ [standard 3.0](ubuntu/standard/3.0)
39+
+ [standard 4.0](ubuntu/standard/4.0)
3940
+ [amazonlinux2-x86_64-standard:1.0](al2/x86_64/standard/1.0)
4041
+ [amazonlinux2-x86_64-standard:2.0](al2/x86_64/standard/2.0)
42+
+ [amazonlinux2-x86_64-standard:3.0](al2/x86_64/standard/3.0)
4143
+ [amazonlinux2-aarch64-standard:1.0](al2/aarch64/standard/1.0)

al2/x86_64/standard/3.0/Dockerfile

Lines changed: 464 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"Profile":{
3+
"ShareCreds" : true,
4+
"ShareProfile" : ""
5+
},
6+
"Mds": {
7+
"CommandWorkersLimit" : 5,
8+
"StopTimeoutMillis" : 20000,
9+
"Endpoint": "",
10+
"CommandRetryLimit": 15
11+
},
12+
"Ssm": {
13+
"Endpoint": "",
14+
"HealthFrequencyMinutes": 5,
15+
"CustomInventoryDefaultLocation" : "",
16+
"AssociationLogsRetentionDurationHours" : 24,
17+
"RunCommandLogsRetentionDurationHours" : 336,
18+
"SessionLogsRetentionDurationHours" : 336
19+
},
20+
"Mgs": {
21+
"Region": "",
22+
"Endpoint": "",
23+
"StopTimeoutMillis" : 20000,
24+
"SessionWorkersLimit" : 1000
25+
},
26+
"Agent": {
27+
"Region": "",
28+
"OrchestrationRootDir": "",
29+
"ContainerMode": true
30+
},
31+
"Os": {
32+
"Lang": "en-US",
33+
"Name": "",
34+
"Version": "1"
35+
},
36+
"S3": {
37+
"Endpoint": "",
38+
"Region": "",
39+
"LogBucket":"",
40+
"LogKey":""
41+
},
42+
"Kms": {
43+
"Endpoint": ""
44+
}
45+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/sh
2+
set -e
3+
4+
/usr/local/bin/dockerd \
5+
--host=unix:///var/run/docker.sock \
6+
--host=tcp://127.0.0.1:2375 \
7+
--storage-driver=overlay2 &>/var/log/docker.log &
8+
9+
10+
tries=0
11+
d_timeout=60
12+
until docker info >/dev/null 2>&1
13+
do
14+
if [ "$tries" -gt "$d_timeout" ]; then
15+
cat /var/log/docker.log
16+
echo 'Timed out trying to connect to internal docker host.' >&2
17+
exit 1
18+
fi
19+
tries=$(( $tries + 1 ))
20+
sleep 1
21+
done
22+
23+
eval "$@"

al2/x86_64/standard/3.0/runtimes.yml

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
version: 0.1
2+
3+
runtimes:
4+
android:
5+
versions:
6+
28:
7+
requires:
8+
java: ["corretto8"]
9+
commands:
10+
- echo "Installing Android version 28 ..."
11+
29:
12+
requires:
13+
java: ["corretto8"]
14+
commands:
15+
- echo "Installing Android version 29 ..."
16+
java:
17+
versions:
18+
corretto11:
19+
commands:
20+
- echo "Installing corretto(OpenJDK) version 11 ..."
21+
22+
- export JAVA_HOME="$JAVA_11_HOME"
23+
24+
- export JRE_HOME="$JRE_11_HOME"
25+
26+
- export JDK_HOME="$JDK_11_HOME"
27+
28+
- |-
29+
for tool_path in "$JAVA_HOME"/bin/*;
30+
do tool=`basename "$tool_path"`;
31+
if [ $tool != 'java-rmi.cgi' ];
32+
then
33+
rm -f /usr/bin/$tool /var/lib/alternatives/$tool \
34+
&& update-alternatives --install /usr/bin/$tool $tool $tool_path 20000;
35+
fi;
36+
done
37+
corretto8:
38+
commands:
39+
- echo "Installing corretto(OpenJDK) version 8 ..."
40+
41+
- export JAVA_HOME="$JAVA_8_HOME"
42+
43+
- export JRE_HOME="$JRE_8_HOME"
44+
45+
- export JDK_HOME="$JDK_8_HOME"
46+
47+
- |-
48+
for tool_path in "$JAVA_8_HOME"/bin/* "$JRE_8_HOME"/bin/*;
49+
do tool=`basename "$tool_path"`;
50+
if [ $tool != 'java-rmi.cgi' ];
51+
then
52+
rm -f /usr/bin/$tool /var/lib/alternatives/$tool \
53+
&& update-alternatives --install /usr/bin/$tool $tool $tool_path 20000;
54+
fi;
55+
done
56+
golang:
57+
versions:
58+
1.12:
59+
commands:
60+
- echo "Installing Go version 1.12 ..."
61+
- goenv global $GOLANG_12_VERSION
62+
1.13:
63+
commands:
64+
- echo "Installing Go version 1.13 ..."
65+
- goenv global $GOLANG_13_VERSION
66+
1.14:
67+
commands:
68+
- echo "Installing Go version 1.14 ..."
69+
- goenv global $GOLANG_14_VERSION
70+
python:
71+
versions:
72+
3.8:
73+
commands:
74+
- echo "Installing Python version 3.8 ..."
75+
- pyenv global $PYTHON_38_VERSION
76+
3.7:
77+
commands:
78+
- echo "Installing Python version 3.7 ..."
79+
- pyenv global $PYTHON_37_VERSION
80+
php:
81+
versions:
82+
7.4:
83+
commands:
84+
- echo "Installing PHP version 7.4 ..."
85+
- phpenv global $PHP_74_VERSION
86+
7.3:
87+
commands:
88+
- echo "Installing PHP version 7.3 ..."
89+
- phpenv global $PHP_73_VERSION
90+
ruby:
91+
versions:
92+
2.6:
93+
commands:
94+
- echo "Installing Ruby version 2.6 ..."
95+
- rbenv global $RUBY_26_VERSION
96+
2.7:
97+
commands:
98+
- echo "Installing Ruby version 2.7 ..."
99+
- rbenv global $RUBY_27_VERSION
100+
nodejs:
101+
versions:
102+
10:
103+
commands:
104+
- echo "Installing Node.js version 10 ..."
105+
- n $NODE_10_VERSION
106+
12:
107+
commands:
108+
- echo "Installing Node.js version 12 ..."
109+
- n $NODE_12_VERSION
110+
docker:
111+
versions:
112+
18:
113+
commands:
114+
- echo "Using Docker 19"
115+
19:
116+
commands:
117+
- echo "Using Docker 19"
118+
dotnet:
119+
versions:
120+
3.1:
121+
commands:
122+
- echo "Installing .NET version 3.1 ..."

al2/x86_64/standard/3.0/ssh_config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Host *
2+
ConnectTimeout 10
3+
ConnectionAttempts 10
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/usr/bin/expect -f
2+
3+
set timeout 1800
4+
set cmd [lindex $argv 0]
5+
set licenses [lindex $argv 1]
6+
7+
spawn {*}$cmd
8+
expect {
9+
"Do you accept the license '*'*" {
10+
exp_send "y\r"
11+
exp_continue
12+
}
13+
"Accept? (y/N): " {
14+
exp_send "y\r"
15+
exp_continue
16+
}
17+
"Review licenses that have not been accepted (y/N)? " {
18+
exp_send "y\r"
19+
exp_continue
20+
}
21+
eof
22+
}
23+
24+
lassign [wait] pid spawnid os_error waitvalue
25+
26+
if {$os_error == 0} {
27+
exit $waitvalue
28+
} else {
29+
exit 1
30+
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
configure_option "--with-curl"
2+
configure_option "--with-libedit"
3+
configure_option "--with-password-argon2"
4+
configure_option "--with-pdo-pgsql"
5+
6+
PHP_BUILD_EXTRA_MAKE_ARGUMENTS="-j4"
7+
8+
#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/7.3.9
9+
#definition for 7.3.12 does not exist in php-build, but codebuild supports it. Hence using 7.3.9's definition.
10+
#Don't change beyond this line
11+
12+
configure_option "--without-pear"
13+
configure_option "--with-gd"
14+
configure_option "--with-png-dir" "/usr"
15+
configure_option "--with-jpeg-dir" "/usr"
16+
configure_option "--enable-zip"
17+
18+
install_package "https://secure.php.net/distributions/php-7.3.12.tar.bz2"
19+
#install_xdebug "2.9.0"
20+
#enable_builtin_opcache
21+
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
configure_option "--with-curl"
2+
configure_option "--with-libedit"
3+
configure_option "--with-password-argon2"
4+
configure_option "--with-pdo-pgsql"
5+
6+
PHP_BUILD_EXTRA_MAKE_ARGUMENTS="-j4"
7+
8+
#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/7.3.13
9+
#Don't change beyond this line
10+
11+
configure_option "--without-pear"
12+
configure_option "--with-gd"
13+
configure_option "--with-png-dir" "/usr"
14+
configure_option "--with-jpeg-dir" "/usr"
15+
configure_option "--enable-zip"
16+
17+
install_package "https://secure.php.net/distributions/php-7.3.13.tar.bz2"
18+
#install_xdebug "2.9.0"
19+
#enable_builtin_opcache
20+
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
configure_option "--with-curl"
2+
configure_option "--with-password-argon2"
3+
configure_option "--with-pdo-pgsql"
4+
configure_option "--with-libedit"
5+
6+
PHP_BUILD_EXTRA_MAKE_ARGUMENTS="-j4"
7+
8+
#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/7.4.0
9+
#Don't change beyond this line
10+
11+
configure_option "--enable-gd"
12+
configure_option "--with-jpeg"
13+
configure_option "--with-zip"
14+
15+
install_package "https://secure.php.net/distributions/php-7.4.0.tar.bz2"
16+
#install_xdebug "2.9.0"
17+
#enable_builtin_opcache
18+

0 commit comments

Comments
 (0)