Skip to content

Commit 67e8129

Browse files
Merge pull request #2 from GoodNotes/swift-5.7-jammy
Add support for building Swift 5.7 in Ubuntu 22.04
2 parents b8df394 + e16b85a commit 67e8129

File tree

3 files changed

+45
-2
lines changed

3 files changed

+45
-2
lines changed

5.7/ubuntu/22.04/Dockerfile

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
FROM ubuntu:22.04
2+
3+
LABEL maintainer="SwiftWasm Maintainers <[email protected]>"
4+
LABEL Description="Docker Container for the SwiftWasm toolchain and SDK"
5+
LABEL org.opencontainers.image.source https://github.com/swiftwasm/swiftwasm-docker
6+
7+
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
8+
apt-get -q install -y \
9+
binutils \
10+
git \
11+
gnupg2 \
12+
libc6-dev \
13+
libcurl4 \
14+
libedit2 \
15+
libgcc-9-dev \
16+
libpython2.7 \
17+
libsqlite3-0 \
18+
libstdc++-9-dev \
19+
libxml2 \
20+
libz3-dev \
21+
pkg-config \
22+
tzdata \
23+
zlib1g-dev \
24+
&& rm -r /var/lib/apt/lists/*
25+
26+
27+
ARG SWIFT_TAG=swift-wasm-5.7.3-RELEASE
28+
ENV SWIFT_PLATFORM_SUFFIX=ubuntu22.04_x86_64.tar.gz
29+
ENV SWIFT_TAG=$SWIFT_TAG
30+
31+
RUN set -e; \
32+
SWIFT_BIN_URL="https://github.com/swiftwasm/swift/releases/download/$SWIFT_TAG/$SWIFT_TAG-$SWIFT_PLATFORM_SUFFIX" \
33+
&& export DEBIAN_FRONTEND=noninteractive \
34+
&& apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
35+
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz \
36+
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \
37+
&& chmod -R o+r /usr/lib/swift \
38+
&& rm -rf swift.tar.gz \
39+
&& apt-get purge --auto-remove -y curl
40+
41+
# Print Installed Swift Version
42+
RUN swift --version

5.8/ubuntu/22.04/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
2525

2626

2727
ARG SWIFT_TAG=swift-wasm-5.8.0-RELEASE
28-
ENV SWIFT_PLATFORM_SUFFIX=ubuntu20.04_x86_64.tar.gz
28+
ENV SWIFT_PLATFORM_SUFFIX=ubuntu22.04_x86_64.tar.gz
2929
ENV SWIFT_TAG=$SWIFT_TAG
3030

3131
RUN set -e; \

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ docker pull ghcr.io/swiftwasm/swift:latest
1515
- [5.8, 5.8-jammy, jammy, latest](https://github.com/swiftwasm/swiftwasm-docker/blob/main/5.8/ubuntu/22.04/Dockerfile)
1616
- [5.8-focal, focal](https://github.com/swiftwasm/swiftwasm-docker/blob/main/5.8/ubuntu/20.04/Dockerfile)
1717
- [5.8-bionic, bionic](https://github.com/swiftwasm/swiftwasm-docker/blob/main/5.8/ubuntu/18.04/Dockerfile)
18-
- [5.7, 5.7-bionic](https://github.com/swiftwasm/swiftwasm-docker/blob/main/5.7/ubuntu/18.04/Dockerfile)
18+
- [5.7, 5.7-jammy](https://github.com/swiftwasm/swiftwasm-docker/blob/main/5.7/ubuntu/22.04/Dockerfile)
19+
- [5.7-bionic](https://github.com/swiftwasm/swiftwasm-docker/blob/main/5.7/ubuntu/18.04/Dockerfile)
1920
- [5.7-focal](https://github.com/swiftwasm/swiftwasm-docker/blob/main/5.7/ubuntu/20.04/Dockerfile)
2021
- [5.6, 5.6-bionic](https://github.com/swiftwasm/swiftwasm-docker/blob/main/5.6/ubuntu/18.04/Dockerfile)
2122
- [5.6-focal](https://github.com/swiftwasm/swiftwasm-docker/blob/main/5.6/ubuntu/20.04/Dockerfile)

0 commit comments

Comments
 (0)