Merge pull request #8 from ndrean/main

Try rm litestream && change csp again

Author: ndrean

Dockerfile

@@ -30,10 +30,10 @@ RUN apt-get update -y && apt-get install -y \
   nodejs && \
   apt-get clean && rm -f /var/lib/apt/lists/*_*
 
-ARG LITESTREAM_VERSION=0.3.13
-# Install litestream
-RUN wget https://github.com/benbjohnson/litestream/releases/download/v${LITESTREAM_VERSION}/litestream-v${LITESTREAM_VERSION}-linux-amd64.deb \
-  && dpkg -i litestream-v${LITESTREAM_VERSION}-linux-amd64.deb
+# ARG LITESTREAM_VERSION=0.3.13
+# # Install litestream
+# RUN wget https://github.com/benbjohnson/litestream/releases/download/v${LITESTREAM_VERSION}/litestream-v${LITESTREAM_VERSION}-linux-amd64.deb \
+#   && dpkg -i litestream-v${LITESTREAM_VERSION}-linux-amd64.deb
 
 RUN npm install -g pnpm 
 RUN pnpm self-update
@@ -121,15 +121,15 @@ RUN mkdir -p /app/data && \
   chown nobody /app
 
 # Copy Litestream binary from build stage
-COPY --from=builder /usr/bin/litestream /usr/bin/litestream
-COPY litestream.sh /app/bin/litestream.sh
-COPY config/litestream.yml /etc/litestream.yml
+# COPY --from=builder /usr/bin/litestream /usr/bin/litestream
+# COPY litestream.sh /app/bin/litestream.sh
+# COPY config/litestream.yml /etc/litestream.yml
 
 USER nobody
 
 EXPOSE 4000
 # Run litestream script as entrypoint
-ENTRYPOINT ["/bin/bash", "/app/bin/litestream.sh"]
+# ENTRYPOINT ["/bin/bash", "/app/bin/litestream.sh"]
 
 CMD ["/bin/sh", "-c", "mkdir -p /app/data && /app/bin/server"]
 

fly.toml

@@ -13,6 +13,7 @@ kill_signal = 'SIGTERM'
   DATABASE_PATH = '/mnt/name/name.db'
   PHX_HOST = 'solidyjs-lively-pine-4375.fly.dev'
   PORT = '8080'
+  MIX_ENV = 'prod'
 
 [[mounts]]
   source = 'name'

lib/solidyjs_web/router.ex

@@ -6,7 +6,7 @@ defmodule SolidyjsWeb.Router do
             "require-trusted-types-for 'script'; script-src 'self' 'wasm-unsafe-eval' 'unsafe-inline'; object-src 'none'; connect-src 'self' https://solidyjs-lively-pine-4375.fly.dev wss://solidyjs-lively-pine-4375.fly.dev ws://solidyjs-lively-pine-4375.fly.dev https://api.maptiler.com/ https://*.maptiler.com/; img-src 'self' data: https://*.maptiler.com/ https://api.maptiler.com/; worker-src 'self' blob:; style-src 'self' 'unsafe-inline'; default-src 'self' https://solidyjs-lively-pine-4375.fly.dev; frame-ancestors 'none'; base-uri 'self'"
 
           _ ->
-            "script-src 'self' 'wasm-unsafe-eval'; object-src 'none'; connect-src http://localhost:* ws://localhost:* https://api.maptiler.com/; img-src 'self' data: https://*.maptiler.com/ https://api.maptiler.com/; worker-src 'self' blob:; style-src 'self' 'unsafe-inline'; default-src 'self'; frame-ancestors 'none'; base-uri 'self'"
+            "script-src 'self' 'wasm-unsafe-eval' 'unsafe-inline'; object-src 'none'; connect-src 'self' http://localhost:* ws://localhost:* wss://localhost:* https://api.maptiler.com/ https://*.maptiler.com/; img-src 'self' data: https://*.maptiler.com/ https://api.maptiler.com/; worker-src 'self' blob:; style-src 'self' 'unsafe-inline'; default-src 'self'; frame-ancestors 'none'; base-uri 'self'"
         end)
 
   # Two years in seconds (recommended for preload)

priv/static/sw.js

@@ -4810,7 +4810,7 @@ precacheAndRoute([{
   "revision": "d6d45a67e8821be4e8a98f2eef6bc659"
 }, {
   "url": "images/maptiler.webp",
-  "revision": "55fd2480bcdf937e3044d5edd2e1a78b"
+  "revision": "db5cfd4710c784d7b2a9130db7d14cfd"
 }, {
   "url": "images/marker-icon-2x.png",
   "revision": "1c824216f354218b04b25a57e0f7ab1f"