Skip to content
This repository was archived by the owner on Jan 17, 2025. It is now read-only.

Commit 9ddd2dd

Browse files
authored
New base images for swift4.1/4.2 to catch fixes. (#69)
1 parent eebfa66 commit 9ddd2dd

File tree

4 files changed

+40
-8
lines changed

4 files changed

+40
-8
lines changed

swift4.1/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# IBM Functions Swift 4.1 Runtime
22

3+
## 1.15.0
4+
Changes:
5+
- Update to a newer base image.
6+
- Include bug and security fixes.
7+
8+
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)
9+
10+
Packages included:
11+
- [Watson SDK 0.38.1](https://github.com/watson-developer-cloud/swift-sdk/releases/tag/0.38.1)
12+
13+
314
## 1.14.0
415
Changes:
516
- update swift from `4.1` to `4.1.3`

swift4.1/Dockerfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
# Dockerfile extends Apache OpenWhisk Swift image https://github.com/apache/incubator-openwhisk-runtime-swift/blob/master/core/swift41Action/Dockerfile
22
# Using git hash https://github.com/apple/swift/commit/4432bfb0c5cf817119ee88ba6108e7c97e13a331
3-
FROM openwhisk/action-swift-v4.1:019024d
3+
FROM openwhisk/action-swift-v4.1:93881a0
44

55
# Add Pre-Installed Pacakges for IBM
66
COPY spm-build/Package.swift /swift4Action/spm-build/Package.swift
77
COPY spm-build/_Whisk.swift /swift4Action/spm-build/Sources/Action/_Whisk.swift
88

99
# Build
10-
RUN rm /swift4Action/spm-build/swiftbuildandlink.sh
11-
RUN python /swift4Action/buildandrecord.py && rm /swift4Action/spm-build/.build/release/Action
10+
RUN apt-get update \
11+
# Update installed packages to get security fixes if available.
12+
&& apt-get upgrade -y --no-install-recommends \
13+
# Cleanup apt data, we do not need them later on.
14+
&& rm -rf /var/lib/apt/lists/* \
15+
&& rm /swift4Action/spm-build/swiftbuildandlink.sh \
16+
&& python /swift4Action/buildandrecord.py && rm /swift4Action/spm-build/.build/release/Action
1217
#RUN cd /swift4Action/spm-build; swift build -v -c release; rm /swift4Action/spm-build/.build/release/Action

swift4.2/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# IBM Functions Swift 4.2 Runtime
22

3+
## 1.3.0
4+
Changes:
5+
- Update to a newer base image.
6+
- Include bug and security fixes.
7+
8+
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)
9+
10+
Packages included:
11+
- [Watson SDK 1.3.1](https://github.com/watson-developer-cloud/swift-sdk/releases/tag/1.3.1)
12+
13+
314
## 1.2.0
415
Changes:
516
- Update Watson SDK from `1.2.0` to `1.3.1`

swift4.2/Dockerfile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
# Dockerfile extends Apache OpenWhisk Swift image https://github.com/apache/incubator-openwhisk-runtime-swift/blob/master/core/swift42Action/Dockerfile
2-
FROM openwhisk/action-swift-v4.2:019024d
2+
FROM openwhisk/action-swift-v4.2:93881a0
33

44
# Add Pre-Installed Pacakges for IBM
55
COPY _Whisk.swift /swiftAction/Sources/
66
COPY Package.swift /swiftAction/
7-
RUN swift build -c release; \
8-
touch /swiftAction/Sources/main.swift; \
9-
rm /swiftAction/.build/release/Action; \
10-
/swiftAction/buildandrecord.py
7+
RUN apt-get update \
8+
# Update installed packages to get security fixes if available.
9+
&& apt-get upgrade -y --no-install-recommends \
10+
# Cleanup apt data, we do not need them later on.
11+
&& rm -rf /var/lib/apt/lists/* \
12+
&& swift build -c release \
13+
&& touch /swiftAction/Sources/main.swift \
14+
&& rm /swiftAction/.build/release/Action \
15+
&& /swiftAction/buildandrecord.py
1116

0 commit comments

Comments
 (0)