You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ms...@apache.org on 2019/07/22 09:27:10 UTC
[incubator-openwhisk-runtime-swift] branch master updated: remove
the pre-optimize latest images (#100)
This is an automated email from the ASF dual-hosted git repository.
msciabarra 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 e8309a6 remove the pre-optimize latest images (#100)
e8309a6 is described below
commit e8309a6a026a1f2438776023f387d1b6b9c82a64
Author: Carlos Santana <cs...@apache.org>
AuthorDate: Mon Jul 22 05:27:05 2019 -0400
remove the pre-optimize latest images (#100)
* change from latest to nighly
* use actionloop nightly
---
core/swift42Action/Dockerfile | 8 ++++----
tools/travis/build.sh | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/core/swift42Action/Dockerfile b/core/swift42Action/Dockerfile
index e3e018b..94961d6 100644
--- a/core/swift42Action/Dockerfile
+++ b/core/swift42Action/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-FROM openwhisk/actionloop as builder
+FROM openwhisk/actionloop:nightly as builder
FROM swift:4.2
@@ -39,9 +39,9 @@ COPY Package.swift /swiftAction/
COPY buildandrecord.py /swiftAction/
COPY main.swift /swiftAction/Sources/
RUN swift build -c release; \
-touch /swiftAction/Sources/main.swift; \
-rm /swiftAction/.build/release/Action; \
-/swiftAction/buildandrecord.py
+ touch /swiftAction/Sources/main.swift; \
+ rm /swiftAction/.build/release/Action; \
+ /swiftAction/buildandrecord.py
ENV OW_COMPILER=/bin/compile
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index b8a18c4..8458314 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -37,12 +37,12 @@ scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR
cd $WHISKDIR
#pull down images
-docker pull openwhisk/controller
-docker tag openwhisk/controller ${IMAGE_PREFIX}/controller
-docker pull openwhisk/invoker
-docker tag openwhisk/invoker ${IMAGE_PREFIX}/invoker
-docker pull openwhisk/nodejs6action
-docker tag openwhisk/nodejs6action nodejs6action
+docker pull openwhisk/controller:nightly
+docker tag openwhisk/controller:nightly ${IMAGE_PREFIX}/controller
+docker pull openwhisk/invoker:nightly
+docker tag openwhisk/invoker:nightly ${IMAGE_PREFIX}/invoker
+docker pull openwhisk/nodejs6action:nightly
+docker tag openwhisk/nodejs6action:nightly nodejs6action
TERM=dumb ./gradlew install