Skip to content

Commit

Permalink
update dockerfile with swift version 5.9
Browse files Browse the repository at this point in the history
  • Loading branch information
saroar committed Nov 2, 2023
1 parent 05297cf commit d91d0c2
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 22 deletions.
37 changes: 16 additions & 21 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# ================================
# Build image
# ================================
FROM swift:5.7-focal as build
FROM swift:5.9-jammy as build

# Install OS updates
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
&& apt-get -q update \
&& apt-get -q dist-upgrade -y \
&& apt-get install -y libsqlite3-dev nano \
&& apt-get -q dist-upgrade -y\
&& rm -rf /var/lib/apt/lists/*

# Set up a build area
Expand All @@ -17,13 +17,17 @@ WORKDIR /build
# as long as your Package.swift/Package.resolved
# files do not change.
COPY ./Package.* ./
RUN swift package resolve
RUN swift package resolve --skip-update \
$([ -f ./Package.resolved ] && echo "--force-resolved-versions" || true)

# Copy entire repo into container
COPY . .

# Build everything, with optimizations
RUN swift build -c release --static-swift-stdlib
RUN swift build -c release --static-swift-stdlib \
# Workaround for https://github.com/apple/swift/pull/68669
# This can be removed as soon as 5.9.1 is released, but is harmless if left in.
-Xlinker -u -Xlinker _swift_backtrace_isThunkFunction

# Switch to the staging area
WORKDIR /staging
Expand All @@ -36,22 +40,22 @@ RUN find -L "$(swift build --package-path /build -c release --show-bin-path)/" -

# Copy any resources from the public directory and views directory if the directories exist
# Ensure that by default, neither the directory nor any of its contents are writable.
RUN [ -d /build/Public ] && { mv /build/Cert ./Cert && chmod -R a-w ./Cert; } || true
RUN [ -d /build/Public ] && { mv /build/Public ./Public && chmod -R a-w ./Public; } || true
RUN [ -d /build/Resources ] && { mv /build/Resources ./Resources && chmod -R a-w ./Resources; } || true

# ================================
# Run image
# ================================
FROM ubuntu:focal
FROM swift:5.9-jammy-slim

# Make sure all system packages are up to date, and install only essential packages.
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
&& apt-get -q update \
&& apt-get -q dist-upgrade -y \
&& apt-get -q install -y \
libcurl4 \
ca-certificates \
tzdata \
libcurl4 \

# If your app or its dependencies import FoundationXML, also install `libxml2`.
# libxml2 \
Expand All @@ -66,18 +70,9 @@ WORKDIR /app
# Copy built executable and any staged resources from builder
COPY --from=build --chown=vapor:vapor /staging /app
COPY --from=build --chown=vapor:vapor /build/.build/release /app
# Uncomment the next line if you need to load resources from the `Public` directory
#COPY --from=build --chown=vapor:vapor /build/Public /app/Public

# Copy dotenv files
#COPY --from=build --chown=vapor:vapor /build/.env /app/.env
#COPY --from=build --chown=vapor:vapor /build/.env.production /app/.env.production
#COPY --from=build --chown=vapor:vapor /build/.env.development /app/.env.development
#COPY --from=build --chown=vapor:vapor /build/.env.test /app/.env.test
# Uncomment the next line if you need to load resources from the `Public` directory
#COPY --from=build --chown=vapor:vapor /build/Public /app/Public
# Uncomment the next line if you need to load resources from the `Resources` directory
#COPY --from=build --chown=vapor:vapor /build/Resources /app/Resources

# Provide configuration needed by the built-in crash reporter and some sensible default behaviors.
ENV SWIFT_ROOT=/usr SWIFT_BACKTRACE=enable=yes,sanitize=yes,threads=all,images=all,interactive=no

# Ensure all further commands run as the vapor user
USER vapor:vapor
Expand All @@ -86,5 +81,5 @@ USER vapor:vapor
EXPOSE 8080

# Start the Vapor service when the image is run, default to listening on 8080 in production environment
ENTRYPOINT ["./Main"]
ENTRYPOINT ["./App"]
CMD ["serve", "--env", "production", "--hostname", "0.0.0.0", "--port", "8080"]
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.7
// swift-tools-version:5.9
import PackageDescription

let package = Package(
Expand Down

0 comments on commit d91d0c2

Please sign in to comment.