Skip to content

Commit 4f2fe48

Browse files
xlcxlc
committed
bump swift 6.1
1 parent d3ae8ae commit 4f2fe48

File tree

2 files changed

+48
-26
lines changed

2 files changed

+48
-26
lines changed

‎scripts/dev.Dockerfile‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM swift:6.0-noble AS builder
1+
FROM swift:6.1-noble AS builder
22
WORKDIR /boka
33

44
RUN apt-get update && \
@@ -29,13 +29,26 @@ WORKDIR /boka
2929
FROM phusion/baseimage:noble-1.0.0
3030
LABEL maintainer="hello@laminar.one"
3131

32-
# from https://github.com/swiftlang/swift-docker/blob/38e4244ebab3d6a4e702fb30449827d6c28ee1fd/6.0/ubuntu/24.04/slim/Dockerfile
32+
# from https://github.com/swiftlang/swift-docker/blob/fad056fa5f65f926323f0ff61129cb4e6b1eec11/6.1/ubuntu/24.04/Dockerfile
3333
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
3434
apt-get -q install -y \
35-
libcurl4 \
36-
libxml2 \
35+
binutils \
36+
git \
37+
unzip \
38+
gnupg2 \
39+
libc6-dev \
40+
libcurl4-openssl-dev \
41+
libedit2 \
42+
libgcc-13-dev \
43+
libpython3-dev \
44+
libsqlite3-0 \
45+
libstdc++-13-dev \
46+
libxml2-dev \
47+
libncurses-dev \
48+
libz3-dev \
49+
pkg-config \
3750
tzdata \
38-
librocksdb-dev \
51+
zlib1g-dev \
3952
&& rm -r /var/lib/apt/lists/*
4053

4154
# Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
@@ -45,8 +58,8 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
4558
# uid [ unknown] Swift 6.x Release Signing Key <swift-infrastructure@forums.swift.org>
4659
ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
4760
ARG SWIFT_PLATFORM=ubuntu24.04
48-
ARG SWIFT_BRANCH=swift-6.0.1-release
49-
ARG SWIFT_VERSION=swift-6.0.1-RELEASE
61+
ARG SWIFT_BRANCH=swift-6.1-release
62+
ARG SWIFT_VERSION=swift-6.1-RELEASE
5063
ARG SWIFT_WEBROOT=https://download.swift.org
5164

5265
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
@@ -70,21 +83,19 @@ RUN set -e; \
7083
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)$OS_ARCH_SUFFIX" \
7184
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM$OS_ARCH_SUFFIX.tar.gz" \
7285
&& SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
73-
# - Grab curl and gpg here so we cache better up above
86+
# - Grab curl here so we cache better up above
7487
&& export DEBIAN_FRONTEND=noninteractive \
75-
&& apt-get -q update && apt-get -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
88+
&& apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
7689
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
7790
&& export GNUPGHOME="$(mktemp -d)" \
7891
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
7992
&& gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
8093
&& gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
8194
# - Unpack the toolchain, set libs permissions, and clean up.
8295
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \
83-
$SWIFT_VERSION-$SWIFT_PLATFORM$OS_ARCH_SUFFIX/usr/lib/swift/linux \
84-
$SWIFT_VERSION-$SWIFT_PLATFORM$OS_ARCH_SUFFIX/usr/libexec/swift/linux \
85-
&& chmod -R o+r /usr/lib/swift /usr/libexec/swift \
96+
&& chmod -R o+r /usr/lib/swift \
8697
&& rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \
87-
&& apt-get purge --auto-remove -y curl gnupg
98+
&& apt-get purge --auto-remove -y curl
8899

89100
RUN useradd -m -u 1001 -U -s /bin/sh -d /boka boka
90101

‎scripts/release.Dockerfile‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM swift:6.0-noble AS builder
1+
FROM swift:6.1-noble AS builder
22
WORKDIR /boka
33

44
RUN apt-get update && \
@@ -30,13 +30,26 @@ WORKDIR /boka
3030
FROM phusion/baseimage:noble-1.0.0
3131
LABEL maintainer="hello@laminar.one"
3232

33-
# from https://github.com/swiftlang/swift-docker/blob/38e4244ebab3d6a4e702fb30449827d6c28ee1fd/6.0/ubuntu/24.04/slim/Dockerfile
33+
# from https://github.com/swiftlang/swift-docker/blob/fad056fa5f65f926323f0ff61129cb4e6b1eec11/6.1/ubuntu/24.04/Dockerfile
3434
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
3535
apt-get -q install -y \
36-
libcurl4 \
37-
libxml2 \
36+
binutils \
37+
git \
38+
unzip \
39+
gnupg2 \
40+
libc6-dev \
41+
libcurl4-openssl-dev \
42+
libedit2 \
43+
libgcc-13-dev \
44+
libpython3-dev \
45+
libsqlite3-0 \
46+
libstdc++-13-dev \
47+
libxml2-dev \
48+
libncurses-dev \
49+
libz3-dev \
50+
pkg-config \
3851
tzdata \
39-
librocksdb-dev \
52+
zlib1g-dev \
4053
&& rm -r /var/lib/apt/lists/*
4154

4255
# Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
@@ -46,8 +59,8 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
4659
# uid [ unknown] Swift 6.x Release Signing Key <swift-infrastructure@forums.swift.org>
4760
ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
4861
ARG SWIFT_PLATFORM=ubuntu24.04
49-
ARG SWIFT_BRANCH=swift-6.0.1-release
50-
ARG SWIFT_VERSION=swift-6.0.1-RELEASE
62+
ARG SWIFT_BRANCH=swift-6.1-release
63+
ARG SWIFT_VERSION=swift-6.1-RELEASE
5164
ARG SWIFT_WEBROOT=https://download.swift.org
5265

5366
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
@@ -71,21 +84,19 @@ RUN set -e; \
7184
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)$OS_ARCH_SUFFIX" \
7285
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM$OS_ARCH_SUFFIX.tar.gz" \
7386
&& SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
74-
# - Grab curl and gpg here so we cache better up above
87+
# - Grab curl here so we cache better up above
7588
&& export DEBIAN_FRONTEND=noninteractive \
76-
&& apt-get -q update && apt-get -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
89+
&& apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
7790
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
7891
&& export GNUPGHOME="$(mktemp -d)" \
7992
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
8093
&& gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
8194
&& gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
8295
# - Unpack the toolchain, set libs permissions, and clean up.
8396
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \
84-
$SWIFT_VERSION-$SWIFT_PLATFORM$OS_ARCH_SUFFIX/usr/lib/swift/linux \
85-
$SWIFT_VERSION-$SWIFT_PLATFORM$OS_ARCH_SUFFIX/usr/libexec/swift/linux \
86-
&& chmod -R o+r /usr/lib/swift /usr/libexec/swift \
97+
&& chmod -R o+r /usr/lib/swift \
8798
&& rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \
88-
&& apt-get purge --auto-remove -y curl gnupg
99+
&& apt-get purge --auto-remove -y curl
89100

90101
RUN useradd -m -u 1001 -U -s /bin/sh -d /boka boka
91102

0 commit comments

Comments
 (0)