Skip to content

Commit ed0d289

Browse files
awsnitinawsnitin
committed
* Add golang 1.10, php 5.6, php 7.0, openjdk 9
* Update AWS cli * Switch from Maven activeProfiles to activation for openjdk image
1 parent 47054bc commit ed0d289

File tree

27 files changed

+823
-23
lines changed

27 files changed

+823
-23
lines changed

Diff for: ‎buildspec.yml

+8
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,13 @@ phases:
3333
- docker build -t aws/codebuild/ruby:2.2.5 .
3434
- cd $CODEBUILD_SRC_DIR/ubuntu/ruby/2.3.1
3535
- 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 .
40+
- cd $CODEBUILD_SRC_DIR/ubuntu/php/5.6
41+
- docker build -t aws/codebuild/php:5.6 .
42+
- cd $CODEBUILD_SRC_DIR/ubuntu/php/7.0
43+
- docker build -t aws/codebuild/php:7.0 .
3644
- cd $CODEBUILD_SRC_DIR/ubuntu/ubuntu-base/14.04
3745
- docker build -t aws/codebuild/ubuntu-base:14.04 .

Diff for: ‎ubuntu/android-java-8/24.4.1/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ RUN set -x \
7474

7575
RUN wget "https://bootstrap.pypa.io/get-pip.py" -O /tmp/get-pip.py \
7676
&& python /tmp/get-pip.py \
77-
&& pip install awscli==1.11.157 \
77+
&& pip install awscli \
7878
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
7979

8080
VOLUME /var/lib/docker

Diff for: ‎ubuntu/docker/17.09.0/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ RUN set -x \
7474

7575
RUN wget "https://bootstrap.pypa.io/get-pip.py" -O /tmp/get-pip.py \
7676
&& python /tmp/get-pip.py \
77-
&& pip install awscli==1.11.157 \
77+
&& pip install awscli \
7878
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
7979

8080
VOLUME /var/lib/docker

Diff for: ‎ubuntu/dot-net/core-1/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ RUN set -x \
7474

7575
RUN wget "https://bootstrap.pypa.io/get-pip.py" -O /tmp/get-pip.py \
7676
&& python /tmp/get-pip.py \
77-
&& pip install awscli==1.11.157 \
77+
&& pip install awscli \
7878
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
7979

8080
VOLUME /var/lib/docker

Diff for: ‎ubuntu/dot-net/core-2/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ RUN set -x \
7474

7575
RUN wget "https://bootstrap.pypa.io/get-pip.py" -O /tmp/get-pip.py \
7676
&& python /tmp/get-pip.py \
77-
&& pip install awscli==1.11.157 \
77+
&& pip install awscli \
7878
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
7979

8080
VOLUME /var/lib/docker

Diff for: ‎ubuntu/golang/1.10/Dockerfile

+107
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
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+
22+
# Building git from source code:
23+
# Ubuntu's default git package is built with broken gnutls. Rebuild git with openssl.
24+
##########################################################################
25+
RUN apt-get update \
26+
&& apt-get install -y --no-install-recommends \
27+
wget=1.15-* python=2.7.5-* python2.7-dev=2.7.6-* fakeroot=1.20-* ca-certificates \
28+
tar=1.27.1-* gzip=1.6-* zip=3.0-* autoconf=2.69-* automake=1:1.14.1-* \
29+
bzip2=1.0.6-* file=1:5.14-* g++=4:4.8.2-* gcc=4:4.8.2-* imagemagick=8:6.7.7.10-* \
30+
libbz2-dev=1.0.6-* libc6-dev=2.19-* libcurl4-openssl-dev=7.35.0-* libdb-dev=1:5.3.21~* \
31+
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-* \
32+
libjpeg-dev=8c-* libkrb5-dev=1.12+dfsg-* liblzma-dev=5.1.1alpha+20120614-* \
33+
libmagickcore-dev=8:6.7.7.10-* libmagickwand-dev=8:6.7.7.10-* libmysqlclient-dev=5.5.59-* \
34+
libncurses5-dev=5.9+20140118-* libpng12-dev=1.2.50-* libpq-dev=9.3.21-* libreadline-dev=6.3-* \
35+
libsqlite3-dev=3.8.2-* libssl-dev=1.0.1f-* libtool=2.4.2-* libwebp-dev=0.4.0-* \
36+
libxml2-dev=2.9.1+dfsg1-* libxslt1-dev=1.1.28-* libyaml-dev=0.1.4-* make=3.81-* \
37+
patch=2.7.1-* xz-utils=5.1.1alpha+20120614-* zlib1g-dev=1:1.2.8.dfsg-* unzip=6.0-* curl=7.35.0-* \
38+
e2fsprogs=1.42.9-* iptables=1.4.21-* xfsprogs=3.1.9ubuntu2 xz-utils=5.1.1alpha+20120614-* \
39+
&& apt-get install -y -qq less=458-* groff=1.22.2-* \
40+
&& apt-get -qy build-dep git=1:1.9.1 \
41+
&& apt-get -qy install libcurl4-openssl-dev=7.35.0-* git-man=1:1.9.1-* liberror-perl=0.17-* \
42+
&& mkdir -p /usr/src/git-openssl \
43+
&& cd /usr/src/git-openssl \
44+
&& apt-get source git=1:1.9.1 \
45+
&& cd $(find -mindepth 1 -maxdepth 1 -type d -name "git-*") \
46+
&& sed -i -- 's/libcurl4-gnutls-dev/libcurl4-openssl-dev/' ./debian/control \
47+
&& sed -i -- '/TEST\s*=\s*test/d' ./debian/rules \
48+
&& dpkg-buildpackage -rfakeroot -b \
49+
&& find .. -type f -name "git_*ubuntu*.deb" -exec dpkg -i \{\} \; \
50+
&& rm -rf /usr/src/git-openssl \
51+
&& rm -rf /var/lib/apt/lists/* \
52+
&& apt-get clean
53+
54+
# Install Docker
55+
RUN set -x \
56+
&& curl -fSL "https://${DOCKER_BUCKET}/linux/static/${DOCKER_CHANNEL}/x86_64/docker-${DOCKER_VERSION}.tgz" -o docker.tgz \
57+
&& echo "${DOCKER_SHA256} *docker.tgz" | sha256sum -c - \
58+
&& tar --extract --file docker.tgz --strip-components 1 --directory /usr/local/bin/ \
59+
&& rm docker.tgz \
60+
&& docker -v \
61+
# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box
62+
&& addgroup dockremap \
63+
&& useradd -g dockremap dockremap \
64+
&& echo 'dockremap:165536:65536' >> /etc/subuid \
65+
&& echo 'dockremap:165536:65536' >> /etc/subgid \
66+
&& wget "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind" -O /usr/local/bin/dind \
67+
&& curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 > /usr/local/bin/docker-compose \
68+
&& chmod +x /usr/local/bin/dind /usr/local/bin/docker-compose \
69+
# Ensure docker-compose works
70+
&& docker-compose version
71+
72+
# Install dependencies by all python images equivalent to buildpack-deps:jessie
73+
# on the public repos.
74+
75+
RUN wget "https://bootstrap.pypa.io/get-pip.py" -O /tmp/get-pip.py \
76+
&& python /tmp/get-pip.py \
77+
&& pip install awscli \
78+
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
79+
80+
VOLUME /var/lib/docker
81+
82+
COPY dockerd-entrypoint.sh /usr/local/bin/
83+
84+
ENTRYPOINT ["dockerd-entrypoint.sh"]
85+
86+
87+
ENV GOLANG_VERSION="1.10" \
88+
GOLANG_DOWNLOAD_SHA256="b5a64335f1490277b585832d1f6c7f8c6c11206cba5cd3f771dcb87b98ad1a33" \
89+
GOPATH="/go" \
90+
DEP_VERSION="0.4.1" \
91+
DEP_BINARY="dep-linux-amd64"
92+
93+
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" \
94+
&& chmod -R 777 "$GOPATH" \
95+
&& apt-get update && apt-get install -y --no-install-recommends \
96+
pkg-config=0.26-* \
97+
&& apt-get clean \
98+
&& wget "https://storage.googleapis.com/golang/go$GOLANG_VERSION.linux-amd64.tar.gz" -O /tmp/golang.tar.gz \
99+
&& echo "$GOLANG_DOWNLOAD_SHA256 /tmp/golang.tar.gz" | sha256sum -c - \
100+
&& tar -xzf /tmp/golang.tar.gz -C /usr/local \
101+
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* \
102+
&& wget "https://github.com/golang/dep/releases/download/v$DEP_VERSION/$DEP_BINARY" -O "$GOPATH/bin/dep"
103+
104+
ENV PATH="$GOPATH/bin:/usr/local/go/bin:$PATH"
105+
WORKDIR $GOPATH
106+
107+
ENTRYPOINT ["dockerd-entrypoint.sh"]

Diff for: ‎ubuntu/golang/1.10/dockerd-entrypoint.sh

+23
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://0.0.0.0: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 "$@"

Diff for: ‎ubuntu/golang/1.7.3/Dockerfile

+6-4
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ RUN set -x \
7474

7575
RUN wget "https://bootstrap.pypa.io/get-pip.py" -O /tmp/get-pip.py \
7676
&& python /tmp/get-pip.py \
77-
&& pip install awscli==1.11.157 \
77+
&& pip install awscli \
7878
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
7979

8080
VOLUME /var/lib/docker
@@ -86,7 +86,9 @@ ENTRYPOINT ["dockerd-entrypoint.sh"]
8686

8787
ENV GOLANG_VERSION="1.7.3" \
8888
GOLANG_DOWNLOAD_SHA256="508028aac0654e993564b6e2014bf2d4a9751e3b286661b0b0040046cf18028e" \
89-
GOPATH="/go"
89+
GOPATH="/go" \
90+
DEP_VERSION="0.4.1" \
91+
DEP_BINARY="dep-linux-amd64"
9092

9193
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" \
9294
&& chmod -R 777 "$GOPATH" \
@@ -96,10 +98,10 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" \
9698
&& wget "https://storage.googleapis.com/golang/go$GOLANG_VERSION.linux-amd64.tar.gz" -O /tmp/golang.tar.gz \
9799
&& echo "$GOLANG_DOWNLOAD_SHA256 /tmp/golang.tar.gz" | sha256sum -c - \
98100
&& tar -xzf /tmp/golang.tar.gz -C /usr/local \
99-
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
101+
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* \
102+
&& wget "https://github.com/golang/dep/releases/download/v$DEP_VERSION/$DEP_BINARY" -O "$GOPATH/bin/dep"
100103

101104
ENV PATH="$GOPATH/bin:/usr/local/go/bin:$PATH"
102-
103105
WORKDIR $GOPATH
104106

105107
ENTRYPOINT ["dockerd-entrypoint.sh"]

Diff for: ‎ubuntu/java/openjdk-8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ RUN set -x \
7474

7575
RUN wget "https://bootstrap.pypa.io/get-pip.py" -O /tmp/get-pip.py \
7676
&& python /tmp/get-pip.py \
77-
&& pip install awscli==1.11.157 \
77+
&& pip install awscli \
7878
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
7979

8080
VOLUME /var/lib/docker

Diff for: ‎ubuntu/java/openjdk-8/m2-settings.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<settings>
2-
<activeProfiles>
3-
<!--make the profile active all the time -->
4-
<activeProfile>securecentral</activeProfile>
5-
</activeProfiles>
62
<profiles>
73
<profile>
84
<id>securecentral</id>
5+
<activation>
6+
<activeByDefault>true</activeByDefault>
7+
</activation>
98
<!--Override the repository (and pluginRepository) "central" from the
109
Maven Super POM -->
1110
<repositories>

0 commit comments

Comments
 (0)