Skip to content

Commit 83ed705

Browse files
committed
update docker files
1 parent 32b99bd commit 83ed705

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

docker/Dockerfile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG swift_version=5.7
1+
ARG swift_version=6.0
22
ARG base_image=swift:$swift_version-amazonlinux2
33
FROM $base_image
44
# needed to do again after FROM due to docker limitation
@@ -11,10 +11,3 @@ RUN yum install -y lsof dnsutils netcat-openbsd net-tools curl jq # used by inte
1111
# tools
1212
RUN mkdir -p $HOME/.tools
1313
RUN echo 'export PATH="$HOME/.tools:$PATH"' >> $HOME/.profile
14-
15-
# swiftformat (until part of the toolchain)
16-
17-
ARG swiftformat_version=0.50.1
18-
RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format
19-
RUN cd $HOME/.tools/swift-format && swift build -c release
20-
RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat

docker/docker-compose.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# this file is not designed to be run directly
22
# instead, use the docker-compose.<os>.<swift> files
3-
# eg docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.al2.57.yaml run test
4-
version: "3"
3+
# eg docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.al2.6.0.yaml run test
54

65
services:
76

@@ -41,7 +40,7 @@ services:
4140
LAMBDA_USE_LOCAL_DEPS=true swift build --package-path Examples/APIGateway &&
4241
LAMBDA_USE_LOCAL_DEPS=true swift build --package-path Examples/AWSSDK &&
4342
LAMBDA_USE_LOCAL_DEPS=true swift build --package-path Examples/HelloWorld &&
44-
LAMBDA_USE_LOCAL_DEPS=true swift build --package-path Examples/Soto &&
43+
LAMBDA_USE_LOCAL_DEPS=true swift build --package-path Examples/Soto
4544
"
4645
4746
# util

readme.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,3 +163,11 @@ tbd + link to docc
163163
### Background Tasks
164164
165165
tbd + link to docc
166+
167+
### Development
168+
169+
Your contributions are welcome. If you open a pull request, be sure to ensure it passes the soundness checks
170+
171+
```
172+
docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.al2.6.0.yaml run soundness
173+
```

0 commit comments

Comments
 (0)