Updated Yarn cache and upgraded Python's PIP, PHP and Node versions (#…

…393)

build/__nodeVersions.sh

@@ -5,9 +5,9 @@ YARN_MINOR_VERSION='1.17'
 YARN_MAJOR_VERSION='1'
 NODE6_VERSION='6.17.1'
 NODE6_MAJOR_MINOR_VERSION='6.17'
-NODE8_VERSION='8.16.1'
+NODE8_VERSION='8.16.2'
 NODE8_MAJOR_MINOR_VERSION='8.16'
 NODE10_VERSION='10.16.3'
 NODE10_MAJOR_MINOR_VERSION='10.16'
-NODE12_VERSION='12.9.1'
-NODE12_MAJOR_MINOR_VERSION='12.9'
+NODE12_VERSION='12.12.0'
+NODE12_MAJOR_MINOR_VERSION='12.12'

build/__phpVersions.sh

@@ -1,15 +1,15 @@
 # This file was auto-generated from 'constants.yaml'. Changes may be overridden.
 
-PHP_BUILD_BASE_TAG='20190918.7'
-PHP_RUNTIME_BASE_TAG='20190918.7'
+PHP_BUILD_BASE_TAG='20191018.1'
+PHP_RUNTIME_BASE_TAG='20191018.1'
 COMPOSER_VERSION='1.8.6'
 COMPOSER_SHA384='a5c698ffe4b8e849a443b120cd5ba38043260d5c4023dbf93e1558871f1f07f58274fc6f4c93bcfd858c6bd0775cd8d1'
-PHP73_VERSION='7.3.9'
+PHP73_VERSION='7.3.10'
 PHP73_KEYS='CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D'
-PHP73_TAR_SHA256='4007f24a39822bef2805b75c625551d30be9eeed329d52eb0838fa5c1b91c1fd'
-PHP72_VERSION='7.2.22'
+PHP73_TAR_SHA256='42f00a15419e05771734b7159c8d39d639b8a5a6770413adfa2615f6f923d906'
+PHP72_VERSION='7.2.23'
 PHP72_KEYS='1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F'
-PHP72_TAR_SHA256='eb597fcf8dc0a6211a42a6346de4f63ee166829a6df6d8ed767fe14be8d1c3a3'
+PHP72_TAR_SHA256='74e045ec8ff26290db6a3688826dcdf43b87bc509e508e9cb76dab742804ca14'
 PHP70_VERSION='7.0.33'
 PHP70_KEYS='1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3'
 PHP70_TAR_SHA256='ab8c5be6e32b1f8d032909dedaaaa4bbb1a209e519abb01a52ce3914f9a13d96'

build/__pythonVersions.sh

@@ -1,7 +1,7 @@
 # This file was auto-generated from 'constants.yaml'. Changes may be overridden.
 
-PYTHON_BASE_TAG='20190918.7'
-PIP_VERSION='19.1.1'
+PYTHON_BASE_TAG='20191018.1'
+PIP_VERSION='19.2.3'
 PYTHON27_VERSION='2.7.16'
 PYTHON36_VERSION='3.6.9'
 PYTHON37_VERSION='3.7.4'

build/constants.yaml

@@ -53,8 +53,8 @@
       file-name-prefix: __
 - name: python-versions
   constants:
-    python-base-tag: 20190918.7
-    pip-version: 19.1.1
+    python-base-tag: 20191018.1
+    pip-version: 19.2.3
     python27-version: 2.7.16
     python36-version: 3.6.9
     python37-version: 3.7.4
@@ -68,17 +68,17 @@
       file-name-prefix: __
 - name: php-versions
   constants:
-    php-build-base-tag: 20190918.7
-    php-runtime-base-tag: 20190918.7
+    php-build-base-tag: 20191018.1
+    php-runtime-base-tag: 20191018.1
     composer-version: 1.8.6
     composer-sha384: a5c698ffe4b8e849a443b120cd5ba38043260d5c4023dbf93e1558871f1f07f58274fc6f4c93bcfd858c6bd0775cd8d1
     # hashes are for .tar.xz
-    php73-version: 7.3.9
+    php73-version: 7.3.10
     php73-keys: CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D
-    php73-tar-sha256: 4007f24a39822bef2805b75c625551d30be9eeed329d52eb0838fa5c1b91c1fd
-    php72-version: 7.2.22
+    php73-tar-sha256: 42f00a15419e05771734b7159c8d39d639b8a5a6770413adfa2615f6f923d906
+    php72-version: 7.2.23
     php72-keys: 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
-    php72-tar-sha256: eb597fcf8dc0a6211a42a6346de4f63ee166829a6df6d8ed767fe14be8d1c3a3
+    php72-tar-sha256: 74e045ec8ff26290db6a3688826dcdf43b87bc509e508e9cb76dab742804ca14
     php70-version: 7.0.33
     php70-keys: 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
     php70-tar-sha256: ab8c5be6e32b1f8d032909dedaaaa4bbb1a209e519abb01a52ce3914f9a13d96
@@ -113,12 +113,12 @@
     yarn-major-version: 1
     node6-version: 6.17.1
     node6-major-minor-version: 6.17
-    node8-version: 8.16.1
+    node8-version: 8.16.2
     node8-major-minor-version: 8.16
     node10-version: 10.16.3
     node10-major-minor-version: 10.16
-    node12-version: 12.9.1
-    node12-major-minor-version: 12.9
+    node12-version: 12.12.0
+    node12-major-minor-version: 12.12
   outputs:
     - type: shell
       directory: build

images/build/Dockerfile

@@ -11,6 +11,7 @@ ENV LANG C.UTF-8
 
 # Install basic build tools
 RUN apt-get update \
+    && apt-get upgrade -y \
     && apt-get install -y --no-install-recommends \
         # Required for .NET Core 1.1
         libunwind8 \
@@ -21,6 +22,7 @@ RUN mkdir -p /tmp/scripts
 # Install .NET Core
 FROM main AS dotnet-install
 RUN apt-get update \
+    && apt-get upgrade -y \
     && apt-get install -y --no-install-recommends \
         # For .NET Core 1.1
         libcurl3 \
@@ -110,6 +112,7 @@ RUN set -ex \
 # Install Node.js, NPM, Yarn
 FROM buildpack-deps:stretch AS node-install
 RUN apt-get update \
+    && apt-get upgrade -y \
     && apt-get install -y --no-install-recommends \
         jq \
     && rm -rf /var/lib/apt/lists/*
@@ -284,7 +287,7 @@ RUN /tmp/scripts/installPhpPrereqs.sh
 # Oryx depends on the run script generators for most of its
 # `IProgrammingPlatform.GenerateBashRunScript()` implementations
 COPY --from=startupScriptGens /opt/startupcmdgen/ /opt/startupcmdgen/
-COPY --from=mcr.microsoft.com/oryx/build-yarn-cache:20190802.1 /usr/local/share/yarn-cache /usr/local/share/yarn-cache
+COPY --from=mcr.microsoft.com/oryx/build-yarn-cache:20191018.1 /usr/local/share/yarn-cache /usr/local/share/yarn-cache
 
 # Copy PHP versions
 COPY --from=php56-build-base /opt /opt

images/build/php/prereqs/build.sh

@@ -31,7 +31,7 @@ if ! command -v gpg > /dev/null; then
 	fetchDeps="$fetchDeps dirmngr gnupg"
 fi
 
-apt-get update && apt-get install -y --no-install-recommends $fetchDeps
+apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends $fetchDeps
 rm -rf /var/lib/apt/lists/*
 
 mkdir -p /usr/src
@@ -63,6 +63,7 @@ fi
 
 savedAptMark="$(apt-mark showmanual)";
 apt-get update;
+apt-get upgrade -y;
 apt-get install -y --no-install-recommends \
 	libcurl4-openssl-dev \
 	libedit-dev \

images/build/php/prereqs/installPrereqs.sh

@@ -19,7 +19,9 @@ set -eux
 PHPIZE_DEPS="autoconf dpkg-dev file g++ gcc libc-dev make pkg-config re2c"
 
 # persistent / runtime deps
-apt-get update && apt-get install -y \
+apt-get update \
+&& apt-get upgrade -y \
+&& apt-get install -y \
         $PHPIZE_DEPS \
         ca-certificates \
         curl \

images/build/python/prereqs/Dockerfile

@@ -6,8 +6,9 @@ COPY images/build/python/prereqs/build.sh /tmp/
 COPY images/receivePgpKeys.sh /tmp/receivePgpKeys.sh
 RUN chmod +x /tmp/receivePgpKeys.sh
 RUN chmod +x /tmp/build.sh && \
-	apt-get update && \
-	apt-get install -y --no-install-recommends \
+	apt-get update \
+	&& apt-get upgrade -y \
+	&& apt-get install -y --no-install-recommends \
 		tk-dev \
 		uuid-dev \
 		libgeos-dev

images/build/slim.Dockerfile

@@ -17,6 +17,7 @@ RUN rm -rf /usr/bin/pydoc*
 
 # Install basic build tools
 RUN apt-get update \
+    && apt-get upgrade -y \
     && apt-get install -y --no-install-recommends \
         git \
         make \
@@ -46,6 +47,7 @@ RUN mkdir -p /opt/oryx/defaultversions
 # Install .NET Core
 FROM main AS dotnet-install
 RUN apt-get update \
+    && apt-get upgrade -y \
     && apt-get install -y --no-install-recommends \
         libc6 \
         libgcc1 \
@@ -104,6 +106,7 @@ RUN set -ex \
 # Install Node.js, NPM, Yarn
 FROM main AS node-install
 RUN apt-get update \
+    && apt-get upgrade -y \
     && apt-get install -y --no-install-recommends \
         jq \
     && rm -rf /var/lib/apt/lists/*
@@ -165,10 +168,11 @@ FROM mcr.microsoft.com/oryx/python-build-base:3.7-${PYTHON_BASE_TAG} AS py37-bui
 FROM main AS python
 # It's not clear whether these are needed at runtime...
 RUN apt-get update \
- && apt-get install -y --no-install-recommends \
+    && apt-get upgrade -y \
+    && apt-get install -y --no-install-recommends \
         tk-dev \
         uuid-dev \
- && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/*
 # https://github.com/docker-library/python/issues/147
 ENV PYTHONIOENCODING UTF-8
 COPY build/__pythonVersions.sh /tmp/scripts

images/runtime/commonbase/Dockerfile

@@ -1,6 +1,8 @@
 FROM buildpack-deps:stretch-curl
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get update \
+	&& apt-get upgrade -y \
+	&& apt-get install -y --no-install-recommends \
 		xz-utils \
 	&& rm -rf /var/lib/apt/lists/*
 

images/runtime/dotnetcore/1.0/Dockerfile

@@ -18,6 +18,7 @@ FROM mcr.microsoft.com/dotnet/core/runtime:1.0.16
 RUN sed -i '/jessie-updates/d' /etc/apt/sources.list  # Now archived
 
 RUN apt-get update \
+  && apt-get upgrade -y \
   && apt-get install -y \
      curl \
      file \

images/runtime/dotnetcore/1.1/Dockerfile

@@ -18,6 +18,7 @@ FROM mcr.microsoft.com/dotnet/core/runtime:1.1.13
 RUN sed -i '/jessie-updates/d' /etc/apt/sources.list  # Now archived
 
 RUN apt-get update \
+  && apt-get upgrade -y \
   && apt-get install -y \
      curl \
      file \

images/runtime/dotnetcore/2.0/Dockerfile

@@ -20,6 +20,7 @@ FROM microsoft/aspnetcore:2.0.9
 RUN sed -i '/jessie-updates/d' /etc/apt/sources.list  # Now archived
 
 RUN apt-get update \
+  && apt-get upgrade -y \
   && apt-get install -y \
      curl \
      file \

images/runtime/dotnetcore/2.1/Dockerfile

@@ -23,6 +23,7 @@ FROM mcr.microsoft.com/dotnet/core/aspnet:2.1.13
 RUN sed -i '/jessie-updates/d' /etc/apt/sources.list  # Now archived
 
 RUN apt-get update \
+  && apt-get upgrade -y \
   && apt-get install -y \
      curl \
      file \

images/runtime/dotnetcore/2.2/Dockerfile

@@ -19,6 +19,7 @@ RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-dump
 FROM mcr.microsoft.com/dotnet/core/aspnet:2.2.7
 
 RUN apt-get update \
+  && apt-get upgrade -y \
   && apt-get install -y \
      file \
      lldb \

images/runtime/dotnetcore/3.0/Dockerfile

@@ -20,6 +20,7 @@ RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-counters
 FROM mcr.microsoft.com/dotnet/core/aspnet:3.0.0
 
 RUN apt-get update \
+  && apt-get upgrade -y \
   && apt-get install -y \
      file \
      lldb \

images/runtime/node/10.1/Dockerfile.base

@@ -51,8 +51,9 @@ CMD [ "node" ]
 
 FROM node-original as main
 
-RUN apt-get update && apt-get install -y \
-  unzip \
+RUN apt-get update \
+  && apt-get install -y \
+    unzip \
   && rm -rf /var/lib/apt/lists/*
 
 COPY images/runtime/node/installDependencies.sh /tmp/scripts/installDependencies.sh

images/runtime/node/10.10/Dockerfile.base

@@ -52,8 +52,9 @@ CMD [ "node" ]
 
 FROM node-original AS main
 
-RUN apt-get update && apt-get install -y \
-  unzip \
+RUN apt-get update \
+  && apt-get install -y \
+    unzip \
   && rm -rf /var/lib/apt/lists/*
 
 COPY images/runtime/node/installDependencies.sh /tmp/scripts/installDependencies.sh

images/runtime/node/10.12/Dockerfile.base

@@ -52,8 +52,9 @@ CMD [ "node" ]
 
 FROM node-original AS main
 
-RUN apt-get update && apt-get install -y \
-  unzip \
+RUN apt-get update \
+  && apt-get install -y \
+    unzip \
   && rm -rf /var/lib/apt/lists/*
 
 COPY images/runtime/node/installDependencies.sh /tmp/scripts/installDependencies.sh

images/runtime/node/10.14/Dockerfile.base

@@ -53,8 +53,9 @@ CMD [ "node" ]
 
 FROM node-original AS main
 
-RUN apt-get update && apt-get install -y \
-  unzip \
+RUN apt-get update \
+  && apt-get install -y \
+    unzip \
   && rm -rf /var/lib/apt/lists/*
 
 COPY images/runtime/node/installDependencies.sh /tmp/scripts/installDependencies.sh

images/runtime/node/10.16/Dockerfile.base

@@ -53,8 +53,9 @@ CMD [ "node" ]
 
 FROM node-original AS main
 
-RUN apt-get update && apt-get install -y \
-  unzip \
+RUN apt-get update \
+  && apt-get install -y \
+    unzip \
   && rm -rf /var/lib/apt/lists/*
 
 COPY images/runtime/node/installDependencies.sh /tmp/scripts/installDependencies.sh

images/runtime/node/10/Dockerfile.base

@@ -54,8 +54,9 @@ CMD [ "node" ]
 
 FROM node-original AS main
 
-RUN apt-get update && apt-get install -y \
-  unzip \
+RUN apt-get update \
+  && apt-get install -y \
+    unzip \
   && rm -rf /var/lib/apt/lists/*
 
 COPY images/runtime/node/installDependencies.sh /tmp/scripts/installDependencies.sh

images/runtime/node/12.9/Dockerfile.base → images/runtime/node/12.12/Dockerfile.base

@@ -3,7 +3,7 @@ FROM oryx-run-base AS node-original
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-ENV NODE_VERSION 12.9.1
+ENV NODE_VERSION 12.12.0
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
@@ -53,8 +53,9 @@ CMD [ "node" ]
 
 FROM node-original AS main
 
-RUN apt-get update && apt-get install -y \
-  unzip \
+RUN apt-get update \
+  && apt-get install -y \
+    unzip \
   && rm -rf /var/lib/apt/lists/*
 
 COPY images/runtime/node/installDependencies.sh /tmp/scripts/installDependencies.sh

images/runtime/node/12/Dockerfile.base

@@ -54,8 +54,9 @@ CMD [ "node" ]
 
 FROM node-original AS main
 
-RUN apt-get update && apt-get install -y \
-  unzip \
+RUN apt-get update \
+  && apt-get install -y \
+    unzip \
   && rm -rf /var/lib/apt/lists/*
 
 COPY images/runtime/node/installDependencies.sh /tmp/scripts/installDependencies.sh

images/runtime/node/4.4/Dockerfile.base

@@ -28,8 +28,9 @@ CMD [ "node" ]
 
 FROM node-original AS main
 
-RUN apt-get update && apt-get install -y \
-  unzip \
+RUN apt-get update \
+  && apt-get install -y \
+    unzip \
   && rm -rf /var/lib/apt/lists/*
 
 COPY images/runtime/node/installDependencies.sh /tmp/scripts/installDependencies.sh

images/runtime/node/4.5/Dockerfile.base

@@ -29,8 +29,9 @@ CMD [ "node" ]
 
 FROM node-original AS main
 
-RUN apt-get update && apt-get install -y \
-  unzip \
+RUN apt-get update \
+  && apt-get install -y \
+    unzip \
   && rm -rf /var/lib/apt/lists/*
 
 COPY images/runtime/node/installDependencies.sh /tmp/scripts/installDependencies.sh