images

.github/workflows/bonfire.yaml

@@ -26,7 +26,7 @@ jobs:
           --health-timeout 5s
           --health-retries 5
     steps:
-    - name: Install system deps (i.e. git)
+    - name: Install git (needed for checkout)
       run: apk add git 
     - name: Checkout repo
       uses: actions/checkout@v2
@@ -48,7 +48,7 @@ jobs:
     #     key: ${{ runner.os }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}
     #     restore-keys: ${{ runner.os }}-mix-
     - name: Install system deps
-      run: apk add git mailcap ca-certificates openssl-dev tzdata gettext
+      run: apk add mailcap ca-certificates openssl-dev tzdata gettext rust cargo make 
     - name: Install hex
       run: mix local.hex --force
     - name: Install rebar

config/bonfire_files.exs

@@ -4,7 +4,7 @@ use Mix.Config
 # see https://hexdocs.pm/waffle/Waffle.html#module-setup-a-storage-provider
 config :waffle,
   storage: Waffle.Storage.Local,
-  asset_host: "" # or {:system, "ASSET_HOST"}
+  asset_host: "/" # or {:system, "ASSET_HOST"}
 
 image_media_types = ["image/png", "image/jpeg", "image/gif", "image/svg+xml", "image/tiff"]
 

config/deploy/Caddyfile2

@@ -6,7 +6,7 @@
 #  on_demand
 # }
 
-route /uploads/* {
+route /data/uploads/* {
   
   root * /frontend/
 

docker-compose.release.yml

@@ -18,7 +18,7 @@ services:
     volumes:
       - type: bind
         source: ./data/uploads
-        target: /var/www/uploads
+        target: /opt/app/data/uploads
   frontend:
     image: "caddy:alpine"
     restart: always

lib/web/endpoint.ex

@@ -13,10 +13,10 @@ defmodule Bonfire.Web.Endpoint do
   socket "/live", Phoenix.LiveView.Socket,
     websocket: [connect_info: [session: @session_options]]
 
-  plug Plug.Static,
-    at: "/data/uploads",
-    from: {:bonfire, "data/uploads"},
-    gzip: true
+  # plug Plug.Static,
+  #   at: "/data/uploads",
+  #   from: {:bonfire, "data/uploads"},
+  #   gzip: false
 
   # Serve at "/" the static files from "priv/static" directory.
   #
@@ -26,7 +26,7 @@ defmodule Bonfire.Web.Endpoint do
     at: "/",
     from: :bonfire,
     gzip: true,
-    only: ~w(uploads css fonts images js favicon.ico robots.txt)
+    only: ~w(data css fonts images js favicon.ico robots.txt)
 
   # Code reloading can be explicitly enabled under the
   # :code_reloader configuration of your endpoint.

mix.lock

@@ -19,11 +19,11 @@
   "bonfire_files": {:git, "https://github.com/bonfire-networks/bonfire_files", "958d9bebb98ff3635155b5638ca352308714def9", [branch: "main"]},
   "bonfire_geolocate": {:git, "https://github.com/bonfire-networks/bonfire_geolocate", "fb66f054bac6b3a813956d7b2d6b1e99e48780b2", [branch: "main"]},
   "bonfire_mailer": {:git, "https://github.com/bonfire-networks/bonfire_mailer", "d7a4a41b76c8d64b7bc7d1add7013ae63ee475fb", [branch: "main"]},
-  "bonfire_me": {:git, "https://github.com/bonfire-networks/bonfire_me", "ba58efe5c38f6c1d7b8bd5a98c87da5b4750a455", [branch: "main"]},
+  "bonfire_me": {:git, "https://github.com/bonfire-networks/bonfire_me", "0a7a5a5083d9ad6c2223bc8d704b44d3cba650ad", [branch: "main"]},
   "bonfire_quantify": {:git, "https://github.com/bonfire-networks/bonfire_quantify", "8ba494f9c88d8cc16b1e1a7908792168cb2c3fef", [branch: "main"]},
   "bonfire_social": {:git, "https://github.com/bonfire-networks/bonfire_social", "566d9cf9a7fc9e952888a49d92502e0bde091a17", [branch: "main"]},
   "bonfire_tag": {:git, "https://github.com/bonfire-networks/bonfire_tag", "ffd9b51fc78d7c36217e4bea063f30dca034dc43", [branch: "main"]},
-  "bonfire_ui_social": {:git, "https://github.com/bonfire-networks/bonfire_ui_social", "3f419ed1e306a00b8714d208568ca4f31d742494", [branch: "main"]},
+  "bonfire_ui_social": {:git, "https://github.com/bonfire-networks/bonfire_ui_social", "b0f0ef2db110dcde58ababb05bd9f1f400910a30", [branch: "main"]},
   "bonfire_valueflows": {:git, "https://github.com/bonfire-networks/bonfire_valueflows", "72db4e7a3a8fa819a37d44d959d7be347baaa0ca", [branch: "main"]},
   "bonfire_website": {:git, "https://github.com/bonfire-networks/bonfire_website", "358ac7cc4619016149fc6d795fd98cc2f7c51d3c", [branch: "main"]},
   "cachex": {:hex, :cachex, "3.3.0", "6f2ebb8f27491fe39121bd207c78badc499214d76c695658b19d6079beeca5c2", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:jumper, "~> 1.0", [hex: :jumper, repo: "hexpm", optional: false]}, {:sleeplocks, "~> 1.1", [hex: :sleeplocks, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm", "d90e5ee1dde14cef33f6b187af4335b88748b72b30c038969176cd4e6ccc31a1"},