fixed templates to include html files

husarion · Oct 4, 2023 · db86eaf · db86eaf
1 parent 68a2f47
commit db86eaf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Caddyfile b/Caddyfile
@@ -7,7 +7,7 @@
 	redir /ui /?ds={$DS_TYPE}&ds.url=ws%3A%2F%2F{http.request.host}%3A{$DS_PORT}
 
 	templates {
-		mime "application/json" "text/plain"
+		mime "application/json" "text/plain" "text/html"
 	}
 
 	file_server browse

diff --git a/Dockerfile b/Dockerfile
@@ -70,15 +70,15 @@ COPY --from=urdf_builder /rosbot.urdf .
 COPY --from=urdf_builder /rosbot_xl.urdf .
 COPY --from=urdf_builder /panther.urdf .
 
-# replace file:///ros2_ws with http://{{.Host}}:FOXGLOVE_PORT/ros2_ws in /src/rosbot_xl.urdf and /src/rosbot.urdf files
-RUN sed -i 's|file:///ros2_ws|http://{{.Host}}:{{env "UI_PORT"}}/ros2_ws|g' /src/rosbot_xl.urdf /src/rosbot.urdf /src/panther.urdf
-
 EXPOSE 8080
 
 ENV DS_TYPE=rosbridge-websocket
 # ENV DS_TYPE=foxglove-websocket
 ENV DS_PORT=9090
 ENV UI_PORT=8080
 
+# replace file:///ros2_ws with http://{{.Host}}:UI_PORT/ros2_ws in /src/rosbot_xl.urdf and /src/rosbot.urdf files
+RUN sed -i 's|file:///ros2_ws|http://{{.Host}}:{{env "UI_PORT"}}/ros2_ws|g' /src/rosbot_xl.urdf /src/rosbot.urdf /src/panther.urdf
+
 ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]
 CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"]
diff --git a/demo/compose.yaml b/demo/compose.yaml
@@ -1,6 +1,6 @@
 services:
   foxglove:
-    image: husarion/foxglove:add-panther-v1.72.0
+    image: husarion/foxglove:v1.72.0
     ports:
       - 8080:8080
     volumes: