Skip to content

Commit 40a2be9

Browse files
authored
add docker compose setup for swift 5.8 (#29)
motivation: prepare for swift 5.8 changes: * align base Dockerfile with lambda runtime * add docker compose setup for nightly 5.8
1 parent 0bd5d23 commit 40a2be9

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG swift_version=5.4
1+
ARG swift_version=5.7
22
ARG base_image=swift:$swift_version-amazonlinux2
33
FROM $base_image
44
# needed to do again after FROM due to docker limitation
@@ -14,7 +14,7 @@ RUN echo 'export PATH="$HOME/.tools:$PATH"' >> $HOME/.profile
1414

1515
# swiftformat (until part of the toolchain)
1616

17-
ARG swiftformat_version=0.47.3
17+
ARG swiftformat_version=0.50.1
1818
RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format
1919
RUN cd $HOME/.tools/swift-format && swift build -c release
2020
RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat

docker/docker-compose.al2.58.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-aws-lambda-events:al2-5.8
7+
build:
8+
args:
9+
base_image: "swiftlang/swift:nightly-5.8-amazonlinux2"
10+
11+
test:
12+
image: swift-aws-lambda-events:al2-5.8
13+
14+
test-samples:
15+
image: swift-aws-lambda-events:al2-5.8
16+
17+
shell:
18+
image: swift-aws-lambda-events:al2-5.8

0 commit comments

Comments
 (0)