Rearrange order of pip installs to try and reduce conflicts

markrogo · May 15, 2020 · 33e48ce · 33e48ce
1 parent 1016f89
commit 33e48ce
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 17 deletions.
diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /var/runtime /var/lang && \
   rm -rf /tmp/warmup /tmp/NuGetScratch
 
 # Add these as a separate layer as they get updated frequently
-RUN pip install -U virtualenv pipenv awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir
+RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 virtualenv pipenv --no-cache-dir
 
 CMD ["dotnet", "build"]
diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile
@@ -21,7 +21,7 @@ RUN rm -rf /var/runtime /var/lang && \
   rm -rf /tmp/warmup /tmp/NuGetScratch /tmp/.dotnet
 
 # Add these as a separate layer as they get updated frequently
-RUN pip install -U virtualenv pipenv awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir && \
+RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 virtualenv pipenv --no-cache-dir && \
   dotnet tool install --global Amazon.Lambda.Tools --version 3.3.1
 
 CMD ["dotnet", "build"]
diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile
@@ -20,7 +20,7 @@ RUN rm -rf /var/runtime /var/lang && \
   rm -rf /tmp/warmup /tmp/NuGetScratch /tmp/.dotnet
 
 # Add these as a separate layer as they get updated frequently
-RUN pip install -U awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir && \
+RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 --no-cache-dir && \
   dotnet tool install --global Amazon.Lambda.Tools --version 3.3.1
 
 CMD ["dotnet", "build"]
diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile
@@ -16,6 +16,6 @@ RUN rm -rf /var/runtime /var/lang && \
   go get golang.org/x/vgo
 
 # Add these as a separate layer as they get updated frequently
-RUN pip install -U awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir
+RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 --no-cache-dir
 
 CMD ["dep", "ensure"]
diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile
@@ -14,4 +14,4 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \
 ENV PATH="/usr/local/gradle/gradle-6.2.2/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}"
 
 # Add these as a separate layer as they get updated frequently
-RUN pip install -U awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir
+RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 --no-cache-dir
diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile
@@ -15,4 +15,4 @@ RUN rm -rf /var/runtime /var/lang && \
 ENV PATH="/usr/local/gradle/gradle-6.2.2/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}"
 
 # Add these as a separate layer as they get updated frequently
-RUN pip install -U awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir
+RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 --no-cache-dir
diff --git a/nodejs10.x/build/Dockerfile b/nodejs10.x/build/Dockerfile
@@ -9,4 +9,4 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \
   curl https://lambci.s3.amazonaws.com/fs/nodejs10.x.tgz | tar -zx -C /
 
 # Add these as a separate layer as they get updated frequently
-RUN pip install -U awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir
+RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 --no-cache-dir
diff --git a/nodejs12.x/build/Dockerfile b/nodejs12.x/build/Dockerfile
@@ -9,4 +9,4 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \
   curl https://lambci.s3.amazonaws.com/fs/nodejs12.x.tgz | tar -zx -C /
 
 # Add these as a separate layer as they get updated frequently
-RUN pip install -U awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir
+RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 --no-cache-dir
diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile
@@ -10,6 +10,6 @@ RUN rm -rf /var/runtime /var/lang && \
   curl https://lambci.s3.amazonaws.com/fs/nodejs4.3.tgz | tar -zx -C /
 
 # Add these as a separate layer as they get updated frequently
-RUN pip install -U awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir
+RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 --no-cache-dir
 
 CMD ["npm", "rebuild"]
diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile
@@ -10,6 +10,6 @@ RUN rm -rf /var/runtime /var/lang && \
   curl https://lambci.s3.amazonaws.com/fs/nodejs6.10.tgz | tar -zx -C /
 
 # Add these as a separate layer as they get updated frequently
-RUN pip install -U awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir
+RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 --no-cache-dir
 
 CMD ["npm", "rebuild"]
diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile
@@ -10,6 +10,6 @@ RUN rm -rf /var/runtime /var/lang && \
   curl https://lambci.s3.amazonaws.com/fs/nodejs8.10.tgz | tar -zx -C /
 
 # Add these as a separate layer as they get updated frequently
-RUN pip install -U awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir
+RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 --no-cache-dir
 
 CMD ["npm", "rebuild"]
diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile
@@ -1,4 +1,4 @@
 FROM lambci/lambda-base:build
 
 # Add these as a separate layer as they get updated frequently
-RUN pip install -U awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir
+RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 --no-cache-dir
diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile
@@ -20,6 +20,6 @@ RUN rm -rf /var/runtime /var/lang && \
 RUN pip install -U pip setuptools wheel --no-cache-dir && \
   pip install -U virtualenv pipenv --no-cache-dir && \
   curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.0.5/get-poetry.py | POETRY_VERSION=1.0.5 python3 && \
-  pip install -U awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir
+  pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 --no-cache-dir
 
 ENV PATH=/root/.poetry/bin:$PATH
diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile
@@ -12,6 +12,6 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \
 RUN pip install -U pip setuptools wheel --no-cache-dir && \
   pip install -U virtualenv pipenv --no-cache-dir && \
   curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.0.5/get-poetry.py | POETRY_VERSION=1.0.5 python3 && \
-  pip install -U awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir
+  pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 --no-cache-dir
 
 ENV PATH=/root/.poetry/bin:$PATH
diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile
@@ -12,6 +12,6 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \
 RUN pip install -U pip setuptools wheel --no-cache-dir && \
   pip install -U virtualenv pipenv --no-cache-dir && \
   curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.0.5/get-poetry.py | POETRY_VERSION=1.0.5 python3 && \
-  pip install -U awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir
+  pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 --no-cache-dir
 
 ENV PATH=/root/.poetry/bin:$PATH
diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile
@@ -13,4 +13,4 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \
 # Add these as a separate layer as they get updated frequently
 RUN gem update --system --no-document && \
   gem install --no-document bundler -v '~> 2.1' && \
-  pip install -U awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir
+  pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 --no-cache-dir
diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile
@@ -13,4 +13,4 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \
 # Add these as a separate layer as they get updated frequently
 RUN gem update --system --no-document && \
   gem install --no-document bundler -v '~> 2.1' && \
-  pip install -U awscli boto3 aws-sam-cli==0.49.0 aws-lambda-builders==0.9.0 --no-cache-dir
+  pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.49.0 awscli boto3 --no-cache-dir