dnrops
/
swift-nio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix docker setup for development snapshots (#1357) 

motivation: test against 5.2 development snapshots

changes:
* update Dockerfile so that a custom base image can be selected
* update 5.2 docker-compose file to use the nighly docker images for 5.2
This commit is contained in:
tomer doron 2020-01-25 01:37:21 -08:00 committed by Cory Benfield
parent 35d8eac588
commit 03f21c251a
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/Dockerfile
View File

@ -1,6 +1,7 @@
ARG swift_version=5.0 ARG swift_version=5.0
ARG ubuntu_version=bionic ARG ubuntu_version=bionic
FROM swift:$swift_version-$ubuntu_version ARG base_image=swift:$swift_version-$ubuntu_version
FROM $base_image
# needed to do again after FROM due to docker limitation # needed to do again after FROM due to docker limitation
ARG swift_version ARG swift_version
ARG ubuntu_version ARG ubuntu_version

5
docker/docker-compose.1804.52.yaml
View File

@ -6,10 +6,7 @@ services:
image: swift-nio:18.04-5.2 image: swift-nio:18.04-5.2
build: build:
args: args:
ubuntu_version: "bionic" base_image: "swiftlang/swift:nightly-5.2-bionic"
swift_version: "5.2"
swift_flavour: "DEVELOPMENT-SNAPSHOT-2020-01-14-a"
swift_builds_suffix: "branch"
unit-tests: unit-tests:
image: swift-nio:18.04-5.2 image: swift-nio:18.04-5.2