Skip to content

Commit 16019e2

Browse files
jfussmhart
jfuss
authored and
mhart
committed
add Gradle and Maven into Java8 + bump aws-lambda-builders (lambci#167)
* add Gradle and Maven into Java8 + bump aws-lambda-builders * Address PR feedback Details: * installation into /usr/local instead of /opt * update PATH with gradle and maven first * simplify maven commands
1 parent 3d4ce51 commit 16019e2

12 files changed

Lines changed: 19 additions & 13 deletions

File tree

‎dotnetcore2.0/build/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ RUN rm -rf /var/runtime /var/lang && \
1919

2020
# Add these as a separate layer as they get updated frequently
2121
RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \
22-
pip install -U virtualenv pipenv awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.0.5 --no-cache-dir
22+
pip install -U virtualenv pipenv awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.1.0 --no-cache-dir
2323

2424
CMD ["dotnet", "build"]

‎dotnetcore2.1/build/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ RUN rm -rf /var/runtime /var/lang && \
1919

2020
# Add these as a separate layer as they get updated frequently
2121
RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \
22-
pip install -U virtualenv pipenv awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.0.5 --no-cache-dir
22+
pip install -U virtualenv pipenv awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.1.0 --no-cache-dir
2323

2424
CMD ["dotnet", "build"]

‎go1.x/build/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ RUN rm -rf /var/runtime /var/lang && \
1616

1717
# Add these as a separate layer as they get updated frequently
1818
RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \
19-
pip install -U awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.0.5 --no-cache-dir
19+
pip install -U awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.1.0 --no-cache-dir
2020

2121
CMD ["dep", "ensure"]

‎java8/build/Dockerfile‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ WORKDIR /
66

77
RUN rm -rf /var/runtime /var/lang && \
88
curl https://lambci.s3.amazonaws.com/fs/java8.tgz | tar -zx -C / && \
9-
yum install -y --releasever=latest java-1.8.0-openjdk-devel-1.8.0.181
9+
yum install -y --releasever=latest java-1.8.0-openjdk-devel-1.8.0.181 && \
10+
mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-5.2-bin.zip && \
11+
unzip -d /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \
12+
curl -L http://mirror.metrocast.net/apache/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.tar.gz | \
13+
tar -zx -C /usr/local/maven
14+
15+
ENV PATH="/usr/local/gradle/gradle-5.2/bin:/usr/local/maven/apache-maven-3.6.0/bin:${PATH}"
1016

1117
# Add these as a separate layer as they get updated frequently
1218
RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \
13-
pip install -U awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.0.5 --no-cache-dir
19+
pip install -U awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.1.0 --no-cache-dir

‎nodejs4.3/build/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ RUN rm -rf /var/runtime /var/lang && \
1111

1212
# Add these as a separate layer as they get updated frequently
1313
RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \
14-
pip install -U awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.0.5 --no-cache-dir
14+
pip install -U awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.1.0 --no-cache-dir
1515

1616
CMD ["npm", "rebuild"]

‎nodejs6.10/build/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ RUN rm -rf /var/runtime /var/lang && \
1111

1212
# Add these as a separate layer as they get updated frequently
1313
RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \
14-
pip install -U awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.0.5 --no-cache-dir
14+
pip install -U awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.1.0 --no-cache-dir
1515

1616
CMD ["npm", "rebuild"]

‎nodejs8.10/build/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ RUN rm -rf /var/runtime /var/lang && \
1111

1212
# Add these as a separate layer as they get updated frequently
1313
RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \
14-
pip install -U awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.0.5 --no-cache-dir
14+
pip install -U awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.1.0 --no-cache-dir
1515

1616
CMD ["npm", "rebuild"]

‎provided/build/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ FROM lambci/lambda-base:build
22

33
# Add these as a separate layer as they get updated frequently
44
RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \
5-
pip install -U awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.0.5 --no-cache-dir
5+
pip install -U awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.1.0 --no-cache-dir

‎python2.7/build/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ RUN rm -rf /var/runtime /var/lang && \
99
# Add these as a separate layer as they get updated frequently
1010
RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \
1111
pip install -U virtualenv pipenv --no-cache-dir && \
12-
pip install -U awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.0.5 --no-cache-dir
12+
pip install -U awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.1.0 --no-cache-dir

‎python3.6/build/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ RUN rm -rf /var/runtime /var/lang && \
1919
# Add these as a separate layer as they get updated frequently
2020
RUN pip install -U pip setuptools --no-cache-dir && \
2121
pip install -U virtualenv pipenv --no-cache-dir && \
22-
pip install -U awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.0.5 --no-cache-dir
22+
pip install -U awscli boto3 aws-sam-cli==0.10.0 aws-lambda-builders==0.1.0 --no-cache-dir

0 commit comments

Comments
 (0)