Merge branch 'master' into accounts

# Conflicts:
#	docker/nginx/Dockerfile

docker-compose.yml

@@ -22,7 +22,7 @@ services:
       context: ./docker/sia
       dockerfile: Dockerfile
       args:
-        branch: v1.5.3
+        branch: v1.5.4
     container_name: sia
     restart: unless-stopped
     logging: *default-logging

docker/nginx/Dockerfile

@@ -1,7 +1,7 @@
 FROM openresty/openresty:1.19.3.1-2-bionic
 
 # RUN apt-get update -qq && apt-get install cron logrotate -qq
-RUN luarocks install luasocket
+# RUN luarocks install luasocket
 
 # CMD ["sh", "-c", "service cron start;", "/usr/local/openresty/bin/openresty -g daemon off;"]
 CMD ["/usr/local/openresty/bin/openresty", "-g", "daemon off;"]

docker/sia/Dockerfile

@@ -8,6 +8,6 @@ ARG branch=master
 RUN git clone https://gitlab.com/NebulousLabs/Sia.git --single-branch --branch ${branch}
 RUN make release --directory Sia
 
-FROM nebulouslabs/sia:1.5.3
+FROM nebulouslabs/sia:1.5.4
 
 COPY --from=sia-builder /go/bin/siac /go/bin/siad /usr/bin/

packages/webapp/src/components/HomeSamples/HomeSamples.js

@@ -10,7 +10,7 @@ const samples = [
   { type: "Audio", url: "/_A2zt5SKoqwnnZU4cBF8uBycSKULXMyeg1c5ZISBr2Q3dA" },
   { type: "Video", url: "/CACqf4NlIMlA0CCCieYGjpViPGyfyJ4v1x3bmuCKZX8FKA" },
   { type: "JSON", url: "/AAC0uO43g64ULpyrW0zO3bjEknSFbAhm8c-RFP21EQlmSQ" },
-  { type: "Dapp", url: "/IAC6CkhNYuWZqMVr1gob1B6tPg4MrBGRzTaDvAIAeu9A9w/" },
+  { type: "Dapp", url: "/hns/marstorage/" },
 ];
 
 export default function HomeSamples() {