Skip to content

update docker compose with new swift versions #6332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 28, 2023
Merged
1 change: 0 additions & 1 deletion Utilities/Docker/docker-compose.2004.57.yaml
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@ services:
args:
ubuntu_version: "focal"
swift_version: "5.7"
base_image: "swiftlang/swift:nightly-5.7-focal"

build:
image: swift-package-manager:20.04-5.7
37 changes: 37 additions & 0 deletions Utilities/Docker/docker-compose.2204.58.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This source file is part of the Swift open source project
#
# Copyright (c) 2023 Apple Inc. and the Swift project authors
# Licensed under Apache License v2.0 with Runtime Library Exception
#
# See http://swift.org/LICENSE.txt for license information
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors

version: "3"

services:

runtime-setup:
image: swift-package-manager:22.04-5.8
build:
args:
ubuntu_version: "jammy"
swift_version: "5.8"
base_image: "swiftlang/swift:nightly-5.8-jammy"

build:
image: swift-package-manager:22.04-5.8

test:
image: swift-package-manager:22.04-5.8

bootstrap-clean:
image: swift-package-manager:22.04-5.8

bootstrap-build:
image: swift-package-manager:22.04-5.8

bootstrap-test:
image: swift-package-manager:22.04-5.8

shell:
image: swift-package-manager:22.04-5.8
37 changes: 37 additions & 0 deletions Utilities/Docker/docker-compose.2204.59.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This source file is part of the Swift open source project
#
# Copyright (c) 2023 Apple Inc. and the Swift project authors
# Licensed under Apache License v2.0 with Runtime Library Exception
#
# See http://swift.org/LICENSE.txt for license information
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors

version: "3"

services:

runtime-setup:
image: swift-package-manager:22.04-5.9
build:
args:
ubuntu_version: "jammy"
swift_version: "5.9"
base_image: "swiftlang/swift:nightly-5.9-jammy"

build:
image: swift-package-manager:22.04-5.9

test:
image: swift-package-manager:22.04-5.9

bootstrap-clean:
image: swift-package-manager:22.04-5.9

bootstrap-build:
image: swift-package-manager:22.04-5.9

bootstrap-test:
image: swift-package-manager:22.04-5.9

shell:
image: swift-package-manager:22.04-5.9
2 changes: 1 addition & 1 deletion Utilities/Docker/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

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

services: