Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Try to fix TSan
  • Loading branch information
Davidde94 committed Jun 22, 2021
commit 7812536320c537db90ce13c91879c38cdffffc2c
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG swift_version=5.2
ARG ubuntu_version=xenial
ARG ubuntu_version=focal
ARG base_image=swift:$swift_version-$ubuntu_version
FROM $base_image
# needed to do again after FROM due to docker limitation
Expand Down
19 changes: 0 additions & 19 deletions docker/docker-compose.1604.52.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ version: "3"
services:

runtime-setup:
image: swift-nio-ssh:18.04-5.3
image: swift-nio-ssh:16.04-5.3
build:
args:
ubuntu_version: "bionic"
ubuntu_version: "xenial"
swift_version: "5.3"

test:
image: swift-nio-ssh:18.04-5.3
image: swift-nio-ssh:16.04-5.3
environment: []
#- SANITIZER_ARG=--sanitize=thread
- SANITIZER_ARG=--sanitize=thread
#- WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors

shell:
image: swift-nio-ssh:18.04-5.3
image: swift-nio-ssh:16.04-5.3
19 changes: 19 additions & 0 deletions docker/docker-compose.1804.52.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: "3"

services:

runtime-setup:
image: swift-nio-ssh:18.04-5.2
build:
args:
ubuntu_version: "bionic"
swift_version: "5.2"

test:
image: swift-nio-ssh:18.04-5.2
environment:
#- SANITIZER_ARG=--sanitize=thread
#- WARN_AS_ERROR_ARG=-warnings-as-errors

shell:
image: swift-nio-ssh:18.04-5.2