Merge pull request #427 from SwiftFiddle/migration

Update Bootstrap 5.3

Author: kishikawakatsumi

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: kishikawakatsumi

.vscode/launch.json

@@ -3,20 +3,22 @@
     {
       "type": "lldb",
       "request": "launch",
-      "name": "Debug Run",
-      "program": "${workspaceFolder:swiftfiddle-formatter}/.build/debug/Run",
+      "sourceLanguages": ["swift"],
+      "name": "Debug App",
+      "program": "${workspaceFolder:swiftfiddle-formatter}/.build/debug/App",
       "args": [],
       "cwd": "${workspaceFolder:swiftfiddle-formatter}",
-      "preLaunchTask": "swift: Build Debug Run"
+      "preLaunchTask": "swift: Build Debug App"
     },
     {
       "type": "lldb",
       "request": "launch",
-      "name": "Release Run",
-      "program": "${workspaceFolder:swiftfiddle-formatter}/.build/release/Run",
+      "sourceLanguages": ["swift"],
+      "name": "Release App",
+      "program": "${workspaceFolder:swiftfiddle-formatter}/.build/release/App",
       "args": [],
       "cwd": "${workspaceFolder:swiftfiddle-formatter}",
-      "preLaunchTask": "swift: Build Release Run"
+      "preLaunchTask": "swift: Build Release App"
     }
   ]
 }

Dockerfile

@@ -15,8 +15,8 @@ RUN npx webpack --config webpack.prod.js
 
 FROM swift:5.8-focal as swift
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
-    && apt-get -q update && apt-get -q dist-upgrade -y \
-    && apt-get install -y --no-install-recommends libsqlite3-dev \
+    && apt-get -q update \
+    && apt-get -q dist-upgrade -y\
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /build
@@ -25,27 +25,37 @@ COPY ./Package.* ./
 RUN swift package resolve
 
 COPY . .
-RUN swift build -c release
+RUN swift build -c release --static-swift-stdlib
 
 COPY ./Resources ./
-RUN cd Resources/formatter && swift build --product swift-format -c release
+RUN cd Resources/formatter && swift build --product swift-format -c release --static-swift-stdlib
 
 WORKDIR /staging
-RUN cp "$(swift build --package-path /build -c release --show-bin-path)/Run" ./ \
-    && mv /build/Public ./Public && chmod -R a-w ./Public \
-    && mv /build/Resources ./Resources && chmod -R a-w ./Resources
+
+RUN cp "$(swift build --package-path /build -c release --show-bin-path)/App" ./
+
+RUN find -L "$(swift build --package-path /build -c release --show-bin-path)/" -regex '.*\.resources$' -exec cp -Ra {} ./ \;
+
+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
 
 
 FROM swift:5.8-focal-slim
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
-    && apt-get -q update && apt-get -q dist-upgrade -y && rm -r /var/lib/apt/lists/*\
-    && useradd --user-group --create-home --system --skel /dev/null --home-dir /app vapor
+    && apt-get -q update \
+    && apt-get -q dist-upgrade -y \
+    && apt-get -q install -y \
+      ca-certificates \
+      tzdata \
+    && rm -r /var/lib/apt/lists/*
+
+RUN useradd --user-group --create-home --system --skel /dev/null --home-dir /app vapor
 
 WORKDIR /app
 COPY --from=swift --chown=vapor:vapor /staging /app
 
 USER vapor:vapor
 EXPOSE $PORT
 
-ENTRYPOINT ["./Run"]
+ENTRYPOINT ["./App"]
 CMD ["serve", "--env", "production", "--hostname", "0.0.0.0"]