You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by cs...@apache.org on 2018/08/17 01:32:24 UTC
[incubator-openwhisk-runtime-swift] branch master updated: extend
swift:4.1 image instead (#80)
This is an automated email from the ASF dual-hosted git repository.
csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-swift.git
The following commit(s) were added to refs/heads/master by this push:
new d997352 extend swift:4.1 image instead (#80)
d997352 is described below
commit d997352a34e1a7de720d37528b06d6195cb7ff9f
Author: Carlos Santana <cs...@apache.org>
AuthorDate: Thu Aug 16 21:32:22 2018 -0400
extend swift:4.1 image instead (#80)
---
core/swift41Action/CHANGELOG.md | 3 ++-
core/swift41Action/Dockerfile | 51 +----------------------------------------
2 files changed, 3 insertions(+), 51 deletions(-)
diff --git a/core/swift41Action/CHANGELOG.md b/core/swift41Action/CHANGELOG.md
index c8daac8..74d7e45 100644
--- a/core/swift41Action/CHANGELOG.md
+++ b/core/swift41Action/CHANGELOG.md
@@ -21,7 +21,8 @@
## 1.0.8
Changes:
- - Update base image to openwhisk/dockerskeleton:1.3.3
+ - Update base image to use python proxy from openwhisk/dockerskeleton:1.3.3
+ - Update base image to extend ibmcom/swift-ubuntu:4.1
## 1.0.7
Changes:
diff --git a/core/swift41Action/Dockerfile b/core/swift41Action/Dockerfile
index 3c005ef..e2c76b0 100644
--- a/core/swift41Action/Dockerfile
+++ b/core/swift41Action/Dockerfile
@@ -16,56 +16,7 @@
#
# TODO Replace this dockerfile and extend from official image when 4.1 is released
-FROM ibmcom/ubuntu:14.04
-LABEL Description="Linux Ubuntu 14.04 image with the Swift binaries and tools."
-
-USER root
-
-# Set environment variables for image
-# Using git hash https://github.com/apple/swift/commit/f01501c324876fc07820dc28923d7088fb7af847
-ENV SWIFT_SNAPSHOT swift-4.1-RELEASE
-ENV SWIFT_SNAPSHOT_LOWERCASE swift-4.1-release
-ENV UBUNTU_VERSION ubuntu14.04
-ENV UBUNTU_VERSION_NO_DOTS ubuntu1404
-ENV WORK_DIR /
-
-# Set WORKDIR
-WORKDIR ${WORK_DIR}
-
-# Linux OS utils and libraries and set clang 3.8 as default
-RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
- build-essential \
- clang-3.8 \
- git \
- libpython2.7 \
- libicu-dev \
- wget \
- libcurl4-openssl-dev \
- vim \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
- && update-alternatives --quiet --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.8 100 \
- && update-alternatives --quiet --install /usr/bin/clang clang /usr/bin/clang-3.8 100 \
- && echo "set -o vi" >> /root/.bashrc
-
-# Install Swift compiler
-RUN wget https://swift.org/builds/$SWIFT_SNAPSHOT_LOWERCASE/$UBUNTU_VERSION_NO_DOTS/$SWIFT_SNAPSHOT/$SWIFT_SNAPSHOT-$UBUNTU_VERSION.tar.gz \
- https://swift.org/builds/$SWIFT_SNAPSHOT_LOWERCASE/$UBUNTU_VERSION_NO_DOTS/$SWIFT_SNAPSHOT/$SWIFT_SNAPSHOT-$UBUNTU_VERSION.tar.gz.sig \
- && gpg --keyserver hkp://pool.sks-keyservers.net \
- --recv-keys \
- '7463 A81A 4B2E EA1B 551F FBCF D441 C977 412B 37AD' \
- '1BE1 E29A 084C B305 F397 D62A 9F59 7F4D 21A5 6D5F' \
- 'A3BA FD35 56A5 9079 C068 94BD 63BC 1CFE 91D3 06C6' \
- '5E4D F843 FB06 5D7F 7E24 FBA2 EF54 30F0 71E1 B235' \
- '8513 444E 2DA3 6B7C 1659 AF4D 7638 F1FB 2B2B 08C4' \
- && gpg --keyserver hkp://pool.sks-keyservers.net --refresh-keys \
- && gpg --verify $SWIFT_SNAPSHOT-$UBUNTU_VERSION.tar.gz.sig \
- && tar xzvf $SWIFT_SNAPSHOT-$UBUNTU_VERSION.tar.gz --strip-components=1 \
- && rm $SWIFT_SNAPSHOT-$UBUNTU_VERSION.tar.gz \
- && rm $SWIFT_SNAPSHOT-$UBUNTU_VERSION.tar.gz.sig \
- && chmod -R go+r /usr/lib/swift \
- && swift --version
-
+FROM ibmcom/swift-ubuntu:4.1
# Upgrade and install basic Python dependencies
RUN apt-get -y update \