From c26996118b452a126af82f153b28a850a0a92b6c Mon Sep 17 00:00:00 2001 From: David Jones Date: Fri, 1 May 2020 16:03:03 +0100 Subject: [PATCH] swift: update to Swift 5.2 (#779) Fixes: appsody/stacks#752 Co-authored-by: Neeraj Laad Co-authored-by: Sandy Koh --- incubator/swift/README.md | 2 +- incubator/swift/image/Dockerfile-stack | 4 ++-- incubator/swift/image/project/Dockerfile | 6 +++--- incubator/swift/stack.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/incubator/swift/README.md b/incubator/swift/README.md index c6b6252e6..1faee1fae 100644 --- a/incubator/swift/README.md +++ b/incubator/swift/README.md @@ -2,7 +2,7 @@ The Swift stack is designed to provide a foundation for building and running Swift applications in Appsody. -This stack is based on the `Swift 5.1` runtime and allows you to develop new or existing Swift applications using Appsody. +This stack is based on the `Swift 5.2` runtime and allows you to develop new or existing Swift applications using Appsody. ## Templates diff --git a/incubator/swift/image/Dockerfile-stack b/incubator/swift/image/Dockerfile-stack index d63d1f110..e27c5d089 100644 --- a/incubator/swift/image/Dockerfile-stack +++ b/incubator/swift/image/Dockerfile-stack @@ -1,10 +1,10 @@ -FROM swift:5.1 +FROM swift:5.2 LABEL Description="Appsody runtime for Swift applications" LABEL maintainer="Ian Partridge , David Jones " RUN apt-get update \ - && apt-get install -y zlib1g-dev libcurl4-openssl-dev libssl-dev \ + && apt-get install -y libcurl4-openssl-dev libssl-dev \ && apt-get clean \ && echo 'Finished installing dependencies' diff --git a/incubator/swift/image/project/Dockerfile b/incubator/swift/image/project/Dockerfile index 3663a950f..873450e04 100644 --- a/incubator/swift/image/project/Dockerfile +++ b/incubator/swift/image/project/Dockerfile @@ -1,9 +1,9 @@ # Install the app dependencies -FROM swift:5.1 as builder +FROM swift:5.2 as builder # Install OS updates RUN apt-get update \ - && apt-get install -y zlib1g-dev libcurl4-openssl-dev libssl-dev \ + && apt-get install -y libcurl4-openssl-dev libssl-dev \ && apt-get clean \ && echo 'Finished installing dependencies' @@ -17,7 +17,7 @@ RUN echo '#!/bin/bash' > run.sh \ && cat output.txt | awk 'END {print "./.build/x86_64-unknown-linux/release/" $NF}' >> run.sh \ && chmod 755 run.sh -FROM swift:5.1-slim +FROM swift:5.2-slim # Install OS updates RUN apt-get update \ diff --git a/incubator/swift/stack.yaml b/incubator/swift/stack.yaml index db2ca2130..d0db6b418 100644 --- a/incubator/swift/stack.yaml +++ b/incubator/swift/stack.yaml @@ -1,5 +1,5 @@ name: Swift -version: 0.2.7 +version: 0.3.0 description: Appsody runtime for Swift applications license: Apache-2.0 language: swift