From 7b1f9fde359ebae261b0db4c578149413d5a4f56 Mon Sep 17 00:00:00 2001 From: Falk Zoll Date: Wed, 11 Mar 2020 09:39:32 +0100 Subject: [PATCH] New base images for swift4.1/4.2 to catch fixes. --- swift4.1/CHANGELOG.md | 11 +++++++++++ swift4.1/Dockerfile | 11 ++++++++--- swift4.2/CHANGELOG.md | 11 +++++++++++ swift4.2/Dockerfile | 15 ++++++++++----- 4 files changed, 40 insertions(+), 8 deletions(-) diff --git a/swift4.1/CHANGELOG.md b/swift4.1/CHANGELOG.md index ac1bc04..6bdf340 100644 --- a/swift4.1/CHANGELOG.md +++ b/swift4.1/CHANGELOG.md @@ -1,5 +1,16 @@ # IBM Functions Swift 4.1 Runtime +## 1.15.0 +Changes: + - Update to a newer base image. + - Include bug and security fixes. + +Swift runtime version: [swift-4.1-RELEASE](https://swift.org/builds/swift-4.1-release/ubuntu1404/swift-4.1-RELEASE/swift-4.1-RELEASE-ubuntu14.04.tar.gz) + +Packages included: + - [Watson SDK 0.38.1](https://github.com/watson-developer-cloud/swift-sdk/releases/tag/0.38.1) + + ## 1.14.0 Changes: - update swift from `4.1` to `4.1.3` diff --git a/swift4.1/Dockerfile b/swift4.1/Dockerfile index 0d14e07..f42eeed 100755 --- a/swift4.1/Dockerfile +++ b/swift4.1/Dockerfile @@ -1,12 +1,17 @@ # Dockerfile extends Apache OpenWhisk Swift image https://github.com/apache/incubator-openwhisk-runtime-swift/blob/master/core/swift41Action/Dockerfile # Using git hash https://github.com/apple/swift/commit/4432bfb0c5cf817119ee88ba6108e7c97e13a331 -FROM openwhisk/action-swift-v4.1:019024d +FROM openwhisk/action-swift-v4.1:93881a0 # Add Pre-Installed Pacakges for IBM COPY spm-build/Package.swift /swift4Action/spm-build/Package.swift COPY spm-build/_Whisk.swift /swift4Action/spm-build/Sources/Action/_Whisk.swift # Build -RUN rm /swift4Action/spm-build/swiftbuildandlink.sh -RUN python /swift4Action/buildandrecord.py && rm /swift4Action/spm-build/.build/release/Action +RUN apt-get update \ + # Update installed packages to get security fixes if available. + && apt-get upgrade -y --no-install-recommends \ + # Cleanup apt data, we do not need them later on. + && rm -rf /var/lib/apt/lists/* \ + && rm /swift4Action/spm-build/swiftbuildandlink.sh \ + && python /swift4Action/buildandrecord.py && rm /swift4Action/spm-build/.build/release/Action #RUN cd /swift4Action/spm-build; swift build -v -c release; rm /swift4Action/spm-build/.build/release/Action diff --git a/swift4.2/CHANGELOG.md b/swift4.2/CHANGELOG.md index d207386..152f9a7 100644 --- a/swift4.2/CHANGELOG.md +++ b/swift4.2/CHANGELOG.md @@ -1,5 +1,16 @@ # IBM Functions Swift 4.2 Runtime +## 1.3.0 +Changes: + - Update to a newer base image. + - Include bug and security fixes. + +Swift runtime version: [swift-4.2.1-RELEASE](https://swift.org/builds/swift-4.2.1-release/ubuntu16.04/swift-4.2.1-RELEASE/swift-4.2.1-RELEASE-ubuntu16.04.tar.gz) + +Packages included: + - [Watson SDK 1.3.1](https://github.com/watson-developer-cloud/swift-sdk/releases/tag/1.3.1) + + ## 1.2.0 Changes: - Update Watson SDK from `1.2.0` to `1.3.1` diff --git a/swift4.2/Dockerfile b/swift4.2/Dockerfile index 5b30578..19be717 100755 --- a/swift4.2/Dockerfile +++ b/swift4.2/Dockerfile @@ -1,11 +1,16 @@ # Dockerfile extends Apache OpenWhisk Swift image https://github.com/apache/incubator-openwhisk-runtime-swift/blob/master/core/swift42Action/Dockerfile -FROM openwhisk/action-swift-v4.2:019024d +FROM openwhisk/action-swift-v4.2:93881a0 # Add Pre-Installed Pacakges for IBM COPY _Whisk.swift /swiftAction/Sources/ COPY Package.swift /swiftAction/ -RUN swift build -c release; \ -touch /swiftAction/Sources/main.swift; \ -rm /swiftAction/.build/release/Action; \ -/swiftAction/buildandrecord.py +RUN apt-get update \ + # Update installed packages to get security fixes if available. + && apt-get upgrade -y --no-install-recommends \ + # Cleanup apt data, we do not need them later on. + && rm -rf /var/lib/apt/lists/* \ + && swift build -c release \ + && touch /swiftAction/Sources/main.swift \ + && rm /swiftAction/.build/release/Action \ + && /swiftAction/buildandrecord.py