Skip to content

Commit 42129a5

Browse files
authored
udpate docker setup (#4188)
motivation: keep docker setup up to date changes: * add docker setup for 5.6 (nightly) * udpate swiftpm system dependencies to include runtime dependencies (needed for tests) * update volume mounts to include the dependencies on swift-system and swift-collections (needed by bootstrap)
1 parent 6c34ebd commit 42129a5

File tree

3 files changed

+43
-2
lines changed

3 files changed

+43
-2
lines changed

Utilities/Docker/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ ENV LANGUAGE en_US.UTF-8
2424
#---------------------
2525

2626
RUN apt-get update && apt-get install -y \
27-
sqlite3 \
27+
git \
2828
libsqlite3-dev \
29-
libncurses5-dev
29+
libncurses5-dev \
30+
sqlite3 \
31+
zip
3032

3133
# Bootstrap script dependencies
3234
#------------------------------
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# This source file is part of the Swift.org open source project
2+
#
3+
# Copyright (c) 2021 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:20.04-5.6
15+
build:
16+
args:
17+
ubuntu_version: "focal"
18+
swift_version: "5.6"
19+
base_image: "swiftlang/swift:nightly-5.6-focal"
20+
21+
build:
22+
image: swift-package-manager:20.04-5.6
23+
24+
test:
25+
image: swift-package-manager:20.04-5.6
26+
27+
bootstrap-clean:
28+
image: swift-package-manager:20.04-5.6
29+
30+
bootstrap-build:
31+
image: swift-package-manager:20.04-5.6
32+
33+
bootstrap-test:
34+
image: swift-package-manager:20.04-5.6
35+
36+
shell:
37+
image: swift-package-manager:20.04-5.6

Utilities/Docker/docker-compose.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ services:
3939
- ../../../swift-driver:/code/swift-driver:z
4040
- ../../../swift-crypto:/code/swift-crypto:z
4141
- ../../../swift-llbuild:/code/llbuild:z
42+
- ../../../swift-system:/code/swift-system:z
43+
- ../../../swift-collections:/code/swift-collections:z
4244
working_dir: /code/swift-package-manager
4345
cap_drop:
4446
- CAP_NET_RAW

0 commit comments

Comments
 (0)