Skip to content

Commit 2c61e62

Browse files
committed
chapter 09 updated
1 parent 1776faf commit 2c61e62

File tree

111 files changed

+1078
-1145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1078
-1145
lines changed

Chapter 03/myProject/Sources/App/Controllers/.gitkeep

Whitespace-only changes.

Chapter 04/myProject/Sources/App/Controllers/.gitkeep

Whitespace-only changes.

Chapter 05/myProject/Sources/App/Controllers/.gitkeep

Whitespace-only changes.

Chapter 06/myProject/Sources/App/Controllers/.gitkeep

Whitespace-only changes.

Chapter 07/myProject/Sources/App/Controllers/.gitkeep

Whitespace-only changes.

Chapter 08/myProject/Sources/App/Controllers/.gitkeep

Whitespace-only changes.

Chapter 09/myProject/.gitignore

Lines changed: 0 additions & 9 deletions
This file was deleted.

Chapter 09/myProject/Dockerfile

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# ================================
2+
# Build image
3+
# ================================
4+
FROM swift:5.7-jammy as build
5+
6+
# Install OS updates and, if needed, sqlite3
7+
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
8+
&& apt-get -q update \
9+
&& apt-get -q dist-upgrade -y\
10+
&& rm -rf /var/lib/apt/lists/*
11+
12+
# Set up a build area
13+
WORKDIR /build
14+
15+
# First just resolve dependencies.
16+
# This creates a cached layer that can be reused
17+
# as long as your Package.swift/Package.resolved
18+
# files do not change.
19+
COPY ./Package.* ./
20+
RUN swift package resolve
21+
22+
# Copy entire repo into container
23+
COPY . .
24+
25+
# Build everything, with optimizations
26+
RUN swift build -c release --static-swift-stdlib
27+
28+
# Switch to the staging area
29+
WORKDIR /staging
30+
31+
# Copy main executable to staging area
32+
RUN cp "$(swift build --package-path /build -c release --show-bin-path)/Run" ./
33+
34+
# Copy resources bundled by SPM to staging area
35+
RUN find -L "$(swift build --package-path /build -c release --show-bin-path)/" -regex '.*\.resources$' -exec cp -Ra {} ./ \;
36+
37+
# Copy any resources from the public directory and views directory if the directories exist
38+
# Ensure that by default, neither the directory nor any of its contents are writable.
39+
RUN [ -d /build/Public ] && { mv /build/Public ./Public && chmod -R a-w ./Public; } || true
40+
RUN [ -d /build/Resources ] && { mv /build/Resources ./Resources && chmod -R a-w ./Resources; } || true
41+
42+
# ================================
43+
# Run image
44+
# ================================
45+
FROM ubuntu:jammy
46+
47+
# Make sure all system packages are up to date, and install only essential packages.
48+
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
49+
&& apt-get -q update \
50+
&& apt-get -q dist-upgrade -y \
51+
&& apt-get -q install -y \
52+
ca-certificates \
53+
tzdata \
54+
# If your app or its dependencies import FoundationNetworking, also install `libcurl4`.
55+
# libcurl4 \
56+
# If your app or its dependencies import FoundationXML, also install `libxml2`.
57+
# libxml2 \
58+
&& rm -r /var/lib/apt/lists/*
59+
60+
# Create a vapor user and group with /app as its home directory
61+
RUN useradd --user-group --create-home --system --skel /dev/null --home-dir /app vapor
62+
63+
# Switch to the new home directory
64+
WORKDIR /app
65+
66+
# Copy built executable and any staged resources from builder
67+
COPY --from=build --chown=vapor:vapor /staging /app
68+
69+
# Ensure all further commands run as the vapor user
70+
USER vapor:vapor
71+
72+
# Let Docker bind to port 8080
73+
EXPOSE 8080
74+
75+
# Start the Vapor service when the image is run, default to listening on 8080 in production environment
76+
ENTRYPOINT ["./Run"]
77+
CMD ["serve", "--env", "production", "--hostname", "0.0.0.0", "--port", "8080"]

Chapter 09/myProject/Makefile

Lines changed: 0 additions & 7 deletions
This file was deleted.

Chapter 09/myProject/Package.swift

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.5
1+
// swift-tools-version:5.7
22
import PackageDescription
33

44
let package = Package(
@@ -7,20 +7,38 @@ let package = Package(
77
.macOS(.v12)
88
],
99
dependencies: [
10-
.package(url: "https://github.com/vapor/vapor", from: "4.54.0"),
11-
.package(url: "https://github.com/vapor/fluent", from: "4.4.0"),
12-
.package(url: "https://github.com/vapor/fluent-sqlite-driver", from: "4.1.0"),
13-
.package(url: "https://github.com/binarybirds/liquid", from: "1.3.0"),
14-
.package(url: "https://github.com/binarybirds/liquid-local-driver", from: "1.3.0"),
15-
.package(url: "https://github.com/binarybirds/swift-html", from: "1.2.0"),
10+
.package(
11+
url: "https://github.com/vapor/vapor",
12+
from: "4.70.0"
13+
),
14+
.package(
15+
url: "https://github.com/vapor/fluent",
16+
from: "4.4.0"
17+
),
18+
.package(
19+
url: "https://github.com/vapor/fluent-sqlite-driver",
20+
from: "4.1.0"
21+
),
22+
.package(
23+
url: "https://github.com/binarybirds/liquid",
24+
from: "1.3.0"
25+
),
26+
.package(
27+
url: "https://github.com/binarybirds/liquid-local-driver",
28+
from: "1.3.0"
29+
),
30+
.package(
31+
url: "https://github.com/binarybirds/swift-html",
32+
from: "1.7.0"
33+
),
1634
],
1735
targets: [
1836
.target(name: "App", dependencies: [
1937
.product(name: "Vapor", package: "vapor"),
2038
.product(name: "Fluent", package: "fluent"),
2139
.product(name: "FluentSQLiteDriver", package: "fluent-sqlite-driver"),
2240
.product(name: "Liquid", package: "liquid"),
23-
.product(name: "LiquidLocalDriver", package: "liquid-local-driver"),
41+
.product(name: "LiquidLocalDriver", package: "liquid-local-driver"),
2442
.product(name: "SwiftHtml", package: "swift-html"),
2543
.product(name: "SwiftSvg", package: "swift-html"),
2644
]),

0 commit comments

Comments
 (0)