Skip to content

Commit c19b3b0

Browse files
authored
update docker compose with new swift versions (#6332)
motivation: keep up with the times changes: add docker compose for 5.8 and 5.9, use stable for 5.7
1 parent 76a2d3b commit c19b3b0

4 files changed

+75
-2
lines changed

Utilities/Docker/docker-compose.2004.57.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ services:
1616
args:
1717
ubuntu_version: "focal"
1818
swift_version: "5.7"
19-
base_image: "swiftlang/swift:nightly-5.7-focal"
2019

2120
build:
2221
image: swift-package-manager:20.04-5.7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# This source file is part of the Swift open source project
2+
#
3+
# Copyright (c) 2023 Apple Inc. and the Swift project authors
4+
# Licensed under Apache License v2.0 with Runtime Library Exception
5+
#
6+
# See http://swift.org/LICENSE.txt for license information
7+
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
8+
9+
version: "3"
10+
11+
services:
12+
13+
runtime-setup:
14+
image: swift-package-manager:22.04-5.8
15+
build:
16+
args:
17+
ubuntu_version: "jammy"
18+
swift_version: "5.8"
19+
base_image: "swiftlang/swift:nightly-5.8-jammy"
20+
21+
build:
22+
image: swift-package-manager:22.04-5.8
23+
24+
test:
25+
image: swift-package-manager:22.04-5.8
26+
27+
bootstrap-clean:
28+
image: swift-package-manager:22.04-5.8
29+
30+
bootstrap-build:
31+
image: swift-package-manager:22.04-5.8
32+
33+
bootstrap-test:
34+
image: swift-package-manager:22.04-5.8
35+
36+
shell:
37+
image: swift-package-manager:22.04-5.8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# This source file is part of the Swift open source project
2+
#
3+
# Copyright (c) 2023 Apple Inc. and the Swift project authors
4+
# Licensed under Apache License v2.0 with Runtime Library Exception
5+
#
6+
# See http://swift.org/LICENSE.txt for license information
7+
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
8+
9+
version: "3"
10+
11+
services:
12+
13+
runtime-setup:
14+
image: swift-package-manager:22.04-5.9
15+
build:
16+
args:
17+
ubuntu_version: "jammy"
18+
swift_version: "5.9"
19+
base_image: "swiftlang/swift:nightly-5.9-jammy"
20+
21+
build:
22+
image: swift-package-manager:22.04-5.9
23+
24+
test:
25+
image: swift-package-manager:22.04-5.9
26+
27+
bootstrap-clean:
28+
image: swift-package-manager:22.04-5.9
29+
30+
bootstrap-build:
31+
image: swift-package-manager:22.04-5.9
32+
33+
bootstrap-test:
34+
image: swift-package-manager:22.04-5.9
35+
36+
shell:
37+
image: swift-package-manager:22.04-5.9

Utilities/Docker/docker-compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
# this file is not designed to be run directly
1010
# instead, use the docker-compose.<os>.<swift> files
11-
# eg docker-compose -f Utilities/docker/docker-compose.yaml -f Utilities/docker/docker-compose.1804.52.yaml run test
11+
# eg docker-compose -f Utilities/docker/docker-compose.yaml -f Utilities/docker/docker-compose.2004.57.yaml run test
1212
version: "3"
1313

1414
services:

0 commit comments

Comments
 (0)