Docker and static files working

Author: fileformat

.dockerignore

@@ -1,2 +1,9 @@
 .build/
+.env
+*.env
+*.md
+*.old
 .swiftpm/
+*.sh
+tmp/
+*.tmp

Dockerfile

@@ -1,65 +1,31 @@
 # ================================
 # Build image
 # ================================
-FROM swift:5.3-focal as build
-
-# Install OS updates and, if needed, sqlite3
-RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
-    && apt-get -q update \
-    && apt-get -q dist-upgrade -y \
-    && rm -rf /var/lib/apt/lists/*
-
-# Set up a build area
+FROM vapor/swift:5.2 as build
 WORKDIR /build
 
-# First just resolve dependencies.
-# This creates a cached layer that can be reused
-# as long as your Package.swift/Package.resolved
-# files do not change.
-COPY ./Package.* ./
-RUN swift package resolve
-
 # Copy entire repo into container
 COPY . .
 
-# Build everything, with optimizations and test discovery
-RUN swift build --enable-test-discovery -c release
-
-# Switch to the staging area
-WORKDIR /staging
-
-# Copy main executable to staging area
-RUN cp "$(swift build --package-path /build -c release --show-bin-path)/Run" ./
+# Compile with optimizations
+RUN swift build \
+    --enable-test-discovery \
+    -c release \
+    -Xswiftc -g
 
-# Copy any resouces 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/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 swift:5.3-focal-slim
-
-# Make sure all system packages are up to date.
-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/*
-
-# Create a vapor user and group with /app as its home directory
-RUN useradd --user-group --create-home --system --skel /dev/null --home-dir /app vapor
-
-# Switch to the new home directory
-WORKDIR /app
-
-# Copy built executable and any staged resources from builder
-COPY --from=build --chown=vapor:vapor /staging /app
-
-# Ensure all further commands run as the vapor user
-USER vapor:vapor
+FROM vapor/ubuntu:18.04
+WORKDIR /run
 
-# Let Docker bind to port 8080
-EXPOSE 8080
+# Copy build artifacts
+COPY --from=build /build/.build/release /run
+# Copy Swift runtime libraries
+COPY --from=build /usr/lib/swift/ /usr/lib/swift/
+# Uncomment the next line if you need to load resources from the `Public` directory
+COPY --from=build /build/Public /run/Public
 
-# Start the Vapor service when the image is run, default to listening on 8080 in production environment
 ENTRYPOINT ["./Run"]
-CMD ["serve", "--env", "production", "--hostname", "0.0.0.0", "--port", "8080"]
+CMD ["serve", "--env", "production", "--hostname", "0.0.0.0"]

Public/favicon.ico

@@ -0,0 +1,5 @@
+#
+# just a backend for the main RegexPlanet.com site: go there to index stuff!
+#
+User-agent: *
+Disallow: /

Public/favicon.svg

@@ -2,8 +2,7 @@ import Vapor
 
 // configures your application
 public func configure(_ app: Application) throws {
-    // uncomment to serve files from /Public folder
-    // app.middleware.use(FileMiddleware(publicDirectory: app.directory.publicDirectory))
+    app.middleware.use(FileMiddleware(publicDirectory: app.directory.publicDirectory))
 
     // register routes
     try routes(app)

Public/robots.txt

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+#
+# run it in Docker
+#
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+ENVFILE=".env"
+
+if [ -f "${ENVFILE}" ]
+then
+	export $(cat "${ENVFILE}")
+fi
+
+
+DOCKER_BUILDKIT=1 docker build -t regexplanet-swift .
+
+docker run -it \
+    -p 8080:8080 \
+    -e LOG_LEVEL=${LOG_LEVEL:-trace} \
+    -e PORT=8080 \
+    regexplanet-swift