Skip to content

Commit 9f12887

Browse files
author
Xin Wang
committed
* Add new image: Android 26.1.1 with Java8, Node.js 8.11.0, Ruby 2.5.1
* Add GitVersion to images * Bind docker port to localhost * Update .NET Core SDK for .NET Core 2.0 * Update composer install in php images * Update Java openjdk 9 image
1 parent 1461cbc commit 9f12887

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+929
-134
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,15 @@ Some of the images in this repository are no longer actively maintained by AWS C
3535
The following images are actively maintained by AWS CodeBuild, and are listed in the CodeBuild console.
3636

3737
+ [android-java-8 24.4.1](ubuntu/android-java-8/24.4.1)
38+
+ [android-java-8 26.1.1](ubuntu/android-java-8/26.1.1)
3839
+ [docker 17.09.0](ubuntu/docker/17.09.0)
3940
+ [dot-net core-1](ubuntu/dot-net/core-1)
4041
+ [dot-net core-2](ubuntu/dot-net/core-2)
4142
+ [golang 1.10](ubuntu/golang/1.10)
42-
+ [golang 1.7.3](ubuntu/golang/1.7.3)
4343
+ [java openjdk-8](ubuntu/java/openjdk-8)
4444
+ [java openjdk-9](ubuntu/java/openjdk-9)
45-
+ [nodejs 4.3.2](ubuntu/nodejs/4.3.2)
46-
+ [nodejs 4.4.7](ubuntu/nodejs/4.4.7)
4745
+ [nodejs 6.3.1](ubuntu/nodejs/6.3.1)
46+
+ [nodejs 8.11.0](ubuntu/nodejs/8.11.0)
4847
+ [php 5.6](ubuntu/php/5.6)
4948
+ [php 7.0](ubuntu/php/7.0)
5049
+ [python 2.7.12](ubuntu/python/2.7.12)
@@ -53,5 +52,6 @@ The following images are actively maintained by AWS CodeBuild, and are listed in
5352
+ [python 3.5.2](ubuntu/python/3.5.2)
5453
+ [ruby 2.2.5](ubuntu/ruby/2.2.5)
5554
+ [ruby 2.3.1](ubuntu/ruby/2.3.1)
55+
+ [ruby 2.5.1](ubuntu/ruby/2.5.1)
5656
+ [ubuntu-base 14.04](ubuntu/ubuntu-base/14.04)
5757

buildspec.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,24 @@ phases:
55
commands:
66
- cd $CODEBUILD_SRC_DIR/ubuntu/android-java-8/24.4.1
77
- docker build -t aws/codebuild/android-java-8:24.4.1 .
8+
- cd $CODEBUILD_SRC_DIR/ubuntu/android-java-8/26.1.1
9+
- docker build -t aws/codebuild/android-java-8:26.1.1 .
810
- cd $CODEBUILD_SRC_DIR/ubuntu/docker/17.09.0
911
- docker build -t aws/codebuild/docker:17.09.0 .
1012
- cd $CODEBUILD_SRC_DIR/ubuntu/dot-net/core-1
1113
- docker build -t aws/codebuild/dot-net:core-1 .
1214
- cd $CODEBUILD_SRC_DIR/ubuntu/dot-net/core-2
1315
- docker build -t aws/codebuild/dot-net:core-2 .
14-
- cd $CODEBUILD_SRC_DIR/ubuntu/golang/1.7.3
15-
- docker build -t aws/codebuild/golang:1.7.3 .
16+
- cd $CODEBUILD_SRC_DIR/ubuntu/golang/1.10
17+
- docker build -t aws/codebuild/golang:1.10 .
1618
- cd $CODEBUILD_SRC_DIR/ubuntu/java/openjdk-8
1719
- docker build -t aws/codebuild/java:openjdk-8 .
18-
- cd $CODEBUILD_SRC_DIR/ubuntu/nodejs/4.3.2
19-
- docker build -t aws/codebuild/nodejs:4.3.2 .
20-
- cd $CODEBUILD_SRC_DIR/ubuntu/nodejs/4.4.7
21-
- docker build -t aws/codebuild/nodejs:4.4.7 .
20+
- cd $CODEBUILD_SRC_DIR/ubuntu/java/openjdk-9
21+
- docker build -t aws/codebuild/java:openjdk-9 .
2222
- cd $CODEBUILD_SRC_DIR/ubuntu/nodejs/6.3.1
2323
- docker build -t aws/codebuild/nodejs:6.3.1 .
24+
- cd $CODEBUILD_SRC_DIR/ubuntu/nodejs/8.11.0
25+
- docker build -t aws/codebuild/nodejs:8.11.0 .
2426
- cd $CODEBUILD_SRC_DIR/ubuntu/python/2.7.12
2527
- docker build -t aws/codebuild/python:2.7.12 .
2628
- cd $CODEBUILD_SRC_DIR/ubuntu/python/3.3.6
@@ -33,10 +35,8 @@ phases:
3335
- docker build -t aws/codebuild/ruby:2.2.5 .
3436
- cd $CODEBUILD_SRC_DIR/ubuntu/ruby/2.3.1
3537
- docker build -t aws/codebuild/ruby:2.3.1 .
36-
- cd $CODEBUILD_SRC_DIR/ubuntu/golang/1.10
37-
- docker build -t aws/codebuild/golang:1.10 .
38-
- cd $CODEBUILD_SRC_DIR/ubuntu/java/openjdk-9
39-
- docker build -t aws/codebuild/java:openjdk-9 .
38+
- cd $CODEBUILD_SRC_DIR/ubuntu/ruby/2.5.1
39+
- docker build -t aws/codebuild/ruby:2.5.1 .
4040
- cd $CODEBUILD_SRC_DIR/ubuntu/php/5.6
4141
- docker build -t aws/codebuild/php:5.6 .
4242
- cd $CODEBUILD_SRC_DIR/ubuntu/php/7.0

ubuntu/android-java-8/24.4.1/Dockerfile

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,15 @@ ENV DOCKER_BUCKET="download.docker.com" \
1717
DOCKER_CHANNEL="stable" \
1818
DOCKER_SHA256="a9e90a73c3cdfbf238f148e1ec0eaff5eb181f92f35bdd938fd7dab18e1c4647" \
1919
DIND_COMMIT="3b5fac462d21ca164b3778647420016315289034" \
20-
DOCKER_COMPOSE_VERSION="1.16.1"
20+
DOCKER_COMPOSE_VERSION="1.16.1" \
21+
GITVERSION_VERSION="3.6.5"
2122

2223
# Building git from source code:
2324
# Ubuntu's default git package is built with broken gnutls. Rebuild git with openssl.
2425
##########################################################################
25-
RUN apt-get update \
26+
RUN set -ex \
27+
&& echo 'Acquire::CompressionTypes::Order:: "gz";' > /etc/apt/apt.conf.d/99use-gzip-compression \
28+
&& apt-get update \
2629
&& apt-get install -y --no-install-recommends \
2730
wget=1.15-* python=2.7.5-* python2.7-dev=2.7.6-* fakeroot=1.20-* ca-certificates \
2831
tar=1.27.1-* gzip=1.6-* zip=3.0-* autoconf=2.69-* automake=1:1.14.1-* \
@@ -36,6 +39,7 @@ RUN apt-get update \
3639
libxml2-dev=2.9.1+dfsg1-* libxslt1-dev=1.1.28-* libyaml-dev=0.1.4-* make=3.81-* \
3740
patch=2.7.1-* xz-utils=5.1.1alpha+20120614-* zlib1g-dev=1:1.2.8.dfsg-* unzip=6.0-* curl=7.35.0-* \
3841
e2fsprogs=1.42.9-* iptables=1.4.21-* xfsprogs=3.1.9ubuntu2 xz-utils=5.1.1alpha+20120614-* \
42+
mono-mcs=3.2.8+dfsg-* \
3943
&& apt-get install -y -qq less=458-* groff=1.22.2-* \
4044
&& apt-get -qy build-dep git=1:1.9.1 \
4145
&& apt-get -qy install libcurl4-openssl-dev=7.35.0-* git-man=1:1.9.1-* liberror-perl=0.17-* \
@@ -51,8 +55,16 @@ RUN apt-get update \
5155
&& rm -rf /var/lib/apt/lists/* \
5256
&& apt-get clean
5357

58+
# Download and set up GitVersion
59+
RUN set -ex \
60+
&& wget "https://github.com/GitTools/GitVersion/releases/download/v${GITVERSION_VERSION}/GitVersion_${GITVERSION_VERSION}.zip" -O /tmp/GitVersion_${GITVERSION_VERSION}.zip \
61+
&& mkdir -p /usr/local/GitVersion_${GITVERSION_VERSION} \
62+
&& unzip /tmp/GitVersion_${GITVERSION_VERSION}.zip -d /usr/local/GitVersion_${GITVERSION_VERSION} \
63+
&& rm /tmp/GitVersion_${GITVERSION_VERSION}.zip \
64+
&& echo "mono /usr/local/GitVersion_${GITVERSION_VERSION}/GitVersion.exe /output json /showvariable \$1" >> /usr/local/bin/gitversion \
65+
&& chmod +x /usr/local/bin/gitversion
5466
# Install Docker
55-
RUN set -x \
67+
RUN set -ex \
5668
&& curl -fSL "https://${DOCKER_BUCKET}/linux/static/${DOCKER_CHANNEL}/x86_64/docker-${DOCKER_VERSION}.tgz" -o docker.tgz \
5769
&& echo "${DOCKER_SHA256} *docker.tgz" | sha256sum -c - \
5870
&& tar --extract --file docker.tgz --strip-components 1 --directory /usr/local/bin/ \
@@ -72,7 +84,8 @@ RUN set -x \
7284
# Install dependencies by all python images equivalent to buildpack-deps:jessie
7385
# on the public repos.
7486

75-
RUN wget "https://bootstrap.pypa.io/get-pip.py" -O /tmp/get-pip.py \
87+
RUN set -ex \
88+
&& wget "https://bootstrap.pypa.io/2.6/get-pip.py" -O /tmp/get-pip.py \
7689
&& python /tmp/get-pip.py \
7790
&& pip install awscli \
7891
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -97,7 +110,8 @@ ENV ANDROID_HOME="/usr/local/android-sdk-linux" \
97110
ENV PATH="${PATH}:/opt/tools:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools"
98111

99112
# Install java8
100-
RUN apt-get update \
113+
RUN set -ex \
114+
&& apt-get update \
101115
&& apt-get install -y software-properties-common=0.92.37.8 \
102116
&& add-apt-repository -y ppa:openjdk-r/ppa \
103117
&& (echo oracle-java$JAVA_VERSION-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections) \

ubuntu/android-java-8/24.4.1/dockerd-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e
33

44
/usr/local/bin/dockerd \
55
--host=unix:///var/run/docker.sock \
6-
--host=tcp://0.0.0.0:2375 \
6+
--host=tcp://127.0.0.1:2375 \
77
--storage-driver=overlay &>/var/log/docker.log &
88

99

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
# Copyright 2017-2017 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+
13+
FROM ubuntu:14.04.5
14+
15+
ENV DOCKER_BUCKET="download.docker.com" \
16+
DOCKER_VERSION="17.09.0-ce" \
17+
DOCKER_CHANNEL="stable" \
18+
DOCKER_SHA256="a9e90a73c3cdfbf238f148e1ec0eaff5eb181f92f35bdd938fd7dab18e1c4647" \
19+
DIND_COMMIT="3b5fac462d21ca164b3778647420016315289034" \
20+
DOCKER_COMPOSE_VERSION="1.16.1" \
21+
GITVERSION_VERSION="3.6.5"
22+
23+
# Building git from source code:
24+
# Ubuntu's default git package is built with broken gnutls. Rebuild git with openssl.
25+
##########################################################################
26+
RUN set -ex \
27+
&& echo 'Acquire::CompressionTypes::Order:: "gz";' > /etc/apt/apt.conf.d/99use-gzip-compression \
28+
&& apt-get update \
29+
&& apt-get install -y --no-install-recommends \
30+
wget=1.15-* python=2.7.5-* python2.7-dev=2.7.6-* fakeroot=1.20-* ca-certificates \
31+
tar=1.27.1-* gzip=1.6-* zip=3.0-* autoconf=2.69-* automake=1:1.14.1-* \
32+
bzip2=1.0.6-* file=1:5.14-* g++=4:4.8.2-* gcc=4:4.8.2-* imagemagick=8:6.7.7.10-* \
33+
libbz2-dev=1.0.6-* libc6-dev=2.19-* libcurl4-openssl-dev=7.35.0-* libdb-dev=1:5.3.21~* \
34+
libevent-dev=2.0.21-stable-* libffi-dev=3.1~rc1+r3.0.13-* libgeoip-dev=1.6.0-* libglib2.0-dev=2.40.2-* \
35+
libjpeg-dev=8c-* libkrb5-dev=1.12+dfsg-* liblzma-dev=5.1.1alpha+20120614-* \
36+
libmagickcore-dev=8:6.7.7.10-* libmagickwand-dev=8:6.7.7.10-* libmysqlclient-dev=5.5.59-* \
37+
libncurses5-dev=5.9+20140118-* libpng12-dev=1.2.50-* libpq-dev=9.3.22-* libreadline-dev=6.3-* \
38+
libsqlite3-dev=3.8.2-* libssl-dev=1.0.1f-* libtool=2.4.2-* libwebp-dev=0.4.0-* \
39+
libxml2-dev=2.9.1+dfsg1-* libxslt1-dev=1.1.28-* libyaml-dev=0.1.4-* make=3.81-* \
40+
patch=2.7.1-* xz-utils=5.1.1alpha+20120614-* zlib1g-dev=1:1.2.8.dfsg-* unzip=6.0-* curl=7.35.0-* \
41+
e2fsprogs=1.42.9-* iptables=1.4.21-* xfsprogs=3.1.9ubuntu2 xz-utils=5.1.1alpha+20120614-* \
42+
mono-mcs=3.2.8+dfsg-* \
43+
&& apt-get install -y -qq less=458-* groff=1.22.2-* \
44+
&& apt-get -qy build-dep git=1:1.9.1 \
45+
&& apt-get -qy install libcurl4-openssl-dev=7.35.0-* git-man=1:1.9.1-* liberror-perl=0.17-* \
46+
&& mkdir -p /usr/src/git-openssl \
47+
&& cd /usr/src/git-openssl \
48+
&& apt-get source git=1:1.9.1 \
49+
&& cd $(find -mindepth 1 -maxdepth 1 -type d -name "git-*") \
50+
&& sed -i -- 's/libcurl4-gnutls-dev/libcurl4-openssl-dev/' ./debian/control \
51+
&& sed -i -- '/TEST\s*=\s*test/d' ./debian/rules \
52+
&& dpkg-buildpackage -rfakeroot -b \
53+
&& find .. -type f -name "git_*ubuntu*.deb" -exec dpkg -i \{\} \; \
54+
&& rm -rf /usr/src/git-openssl \
55+
&& rm -rf /var/lib/apt/lists/* \
56+
&& apt-get clean
57+
58+
# Download and set up GitVersion
59+
RUN set -ex \
60+
&& wget "https://github.com/GitTools/GitVersion/releases/download/v${GITVERSION_VERSION}/GitVersion_${GITVERSION_VERSION}.zip" -O /tmp/GitVersion_${GITVERSION_VERSION}.zip \
61+
&& mkdir -p /usr/local/GitVersion_${GITVERSION_VERSION} \
62+
&& unzip /tmp/GitVersion_${GITVERSION_VERSION}.zip -d /usr/local/GitVersion_${GITVERSION_VERSION} \
63+
&& rm /tmp/GitVersion_${GITVERSION_VERSION}.zip \
64+
&& echo "mono /usr/local/GitVersion_${GITVERSION_VERSION}/GitVersion.exe /output json /showvariable \$1" >> /usr/local/bin/gitversion \
65+
&& chmod +x /usr/local/bin/gitversion
66+
# Install Docker
67+
RUN set -ex \
68+
&& curl -fSL "https://${DOCKER_BUCKET}/linux/static/${DOCKER_CHANNEL}/x86_64/docker-${DOCKER_VERSION}.tgz" -o docker.tgz \
69+
&& echo "${DOCKER_SHA256} *docker.tgz" | sha256sum -c - \
70+
&& tar --extract --file docker.tgz --strip-components 1 --directory /usr/local/bin/ \
71+
&& rm docker.tgz \
72+
&& docker -v \
73+
# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box
74+
&& addgroup dockremap \
75+
&& useradd -g dockremap dockremap \
76+
&& echo 'dockremap:165536:65536' >> /etc/subuid \
77+
&& echo 'dockremap:165536:65536' >> /etc/subgid \
78+
&& wget "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind" -O /usr/local/bin/dind \
79+
&& curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 > /usr/local/bin/docker-compose \
80+
&& chmod +x /usr/local/bin/dind /usr/local/bin/docker-compose \
81+
# Ensure docker-compose works
82+
&& docker-compose version
83+
84+
# Install dependencies by all python images equivalent to buildpack-deps:jessie
85+
# on the public repos.
86+
87+
RUN set -ex \
88+
&& wget "https://bootstrap.pypa.io/2.6/get-pip.py" -O /tmp/get-pip.py \
89+
&& python /tmp/get-pip.py \
90+
&& pip install awscli \
91+
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
92+
93+
VOLUME /var/lib/docker
94+
95+
COPY dockerd-entrypoint.sh /usr/local/bin/
96+
97+
# Copy install tools
98+
COPY tools /opt/tools
99+
100+
ENV NODE_VERSION="8.11.0" \
101+
ANDROID_HOME="/usr/local/android-sdk-linux" \
102+
JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64" \
103+
JAVA_VERSION="8" \
104+
JDK_VERSION="8u162-b12-1~14.04" \
105+
JDK_HOME="/usr/lib/jvm/java-8-openjdk-amd64" \
106+
JRE_HOME="/usr/lib/jvm/java-8-openjdk-amd64/jre" \
107+
INSTALLED_GRADLE_VERSIONS="2.14.1 3.5 4.0.2 4.1 4.2.1 4.3.1 4.4 4.6" \
108+
GRADLE_VERSION="4.6" \
109+
# Android SDK manager for 26.1.1
110+
ANDROID_SDK_MANAGER_VER="3859397" \
111+
ANDROID_SDK_MANAGER_SHA256="444e22ce8ca0f67353bda4b85175ed3731cae3ffa695ca18119cbacef1c1bea0" \
112+
ANDROID_SDK_BUILD_TOOLS="build-tools;19.1.0 build-tools;20.0.0 build-tools;21.1.2 build-tools;22.0.1 build-tools;23.0.3 build-tools;24.0.3 build-tools;25.0.3 build-tools;26.0.3 build-tools;27.0.3" \
113+
ANDROID_SDK_PLATFORM_TOOLS="platforms;android-19 platforms;android-20 platforms;android-21 platforms;android-22 platforms;android-23 platforms;android-24 platforms;android-25 platforms;android-26 platforms;android-27" \
114+
ANDROID_SDK_EXTRAS="extras;android;m2repository extras;google;m2repository extras;google;google_play_services"
115+
ENV PATH="${PATH}:/opt/tools:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools"
116+
117+
RUN set -ex \
118+
&& for key in \
119+
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
120+
0034A06D9D9B0064CE8ADF6BF1747F4AD2306D93 \
121+
FD3A5288F042B6850C66B31F09FE44734EB7990E \
122+
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
123+
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
124+
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
125+
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
126+
77984A986EBC2AA786BC0F66B01FBB92821C587A \
127+
56730D5401028683275BD23C23EFEFE93C4CFFFE \
128+
; do \
129+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
130+
done
131+
132+
# Install nodejs
133+
RUN set -ex \
134+
&& wget "https://nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" -O node-v$NODE_VERSION-linux-x64.tar.gz \
135+
&& wget "https://nodejs.org/download/release/v$NODE_VERSION/SHASUMS256.txt.asc" -O SHASUMS256.txt.asc \
136+
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
137+
&& grep " node-v$NODE_VERSION-linux-x64.tar.gz\$" SHASUMS256.txt | sha256sum -c - \
138+
&& tar -xzf "node-v$NODE_VERSION-linux-x64.tar.gz" -C /usr/local --strip-components=1 \
139+
&& rm "node-v$NODE_VERSION-linux-x64.tar.gz" SHASUMS256.txt.asc SHASUMS256.txt \
140+
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
141+
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
142+
143+
# Install java8
144+
RUN set -ex \
145+
&& apt-get update \
146+
&& apt-get install -y software-properties-common=0.92.37.8 \
147+
&& add-apt-repository -y ppa:openjdk-r/ppa \
148+
&& (echo oracle-java${JAVA_VERSION}-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections) \
149+
&& apt-get update \
150+
&& apt-get -y install openjdk-${JAVA_VERSION}-jdk=${JDK_VERSION} \
151+
&& update-ca-certificates -f \
152+
&& apt-get install -y -qq less=458-* groff=1.22.2-* \
153+
&& dpkg --add-architecture i386 \
154+
&& apt-get update && apt-get install -y --force-yes expect=5.45-* libc6-i386=2.19-* \
155+
lib32stdc++6=4.8.4-* lib32gcc1=1:4.9.3-* lib32ncurses5=5.9+20140118-* \
156+
lib32z1=1:1.2.8.dfsg-* libqt5widgets5=5.2.1+dfsg-* \
157+
&& apt-get clean \
158+
# Precache most relevant versions of Gradle for `gradlew` scripts
159+
&& mkdir -p /usr/src/gradle \
160+
&& for version in $INSTALLED_GRADLE_VERSIONS; do { \
161+
wget "https://services.gradle.org/distributions/gradle-$version-all.zip" -O "/usr/src/gradle/gradle-$version-all.zip" \
162+
&& unzip "/usr/src/gradle/gradle-$version-all.zip" -d /usr/local \
163+
&& mkdir "/tmp/gradle-$version" \
164+
&& "/usr/local/gradle-$version/bin/gradle" -p "/tmp/gradle-$version" wrapper \
165+
# Android Studio uses the "-all" distribution for it's wrapper script.
166+
&& perl -pi -e "s/gradle-$version-bin.zip/gradle-$version-all.zip/" "/tmp/gradle-$version/gradle/wrapper/gradle-wrapper.properties" \
167+
&& "/tmp/gradle-$version/gradlew" -p "/tmp/gradle-$version" init \
168+
&& rm -rf "/tmp/gradle-$version" \
169+
&& if [ "$version" != "$GRADLE_VERSION" ]; then rm -rf "/usr/local/gradle-$version"; fi; \
170+
}; done \
171+
# Install default GRADLE_VERSION to path
172+
&& ln -s /usr/local/gradle-$GRADLE_VERSION/bin/gradle /usr/bin/gradle \
173+
&& rm -rf /usr/src/gradle \
174+
# Install Android SDK manager
175+
&& wget "https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_MANAGER_VER}.zip" -O /tmp/android-sdkmanager.zip \
176+
&& echo "${ANDROID_SDK_MANAGER_SHA256} /tmp/android-sdkmanager.zip" | sha256sum -c - \
177+
&& mkdir -p ${ANDROID_HOME} \
178+
&& unzip /tmp/android-sdkmanager.zip -d ${ANDROID_HOME} \
179+
&& chown -R root.root ${ANDROID_HOME} \
180+
&& ln -s ${ANDROID_HOME}/tools/android /usr/bin/android \
181+
# Install Android SDK
182+
&& android-accept-licenses.sh "sdkmanager --verbose platform-tools ${ANDROID_SDK_BUILD_TOOLS} ${ANDROID_SDK_PLATFORM_TOOLS} ${ANDROID_SDK_EXTRAS}" \
183+
&& android-accept-licenses.sh "sdkmanager --licenses" \
184+
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
185+
186+
ENTRYPOINT ["dockerd-entrypoint.sh"]
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=overlay &>/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 "$@"
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
}

0 commit comments

Comments
 (0)