From 1a9e4f1a4dd8d7edffd41b5261a55c3e44f9435d Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Fri, 8 Jan 2021 13:47:30 +0100 Subject: [PATCH 1/3] upgrade openresty image to ubuntu 18 --- docker-compose.yml | 4 +++- docker/nginx/Dockerfile | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 docker/nginx/Dockerfile diff --git a/docker-compose.yml b/docker-compose.yml index 534428aa..ba3001c1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -61,7 +61,9 @@ services: - nginx nginx: - image: openresty/openresty:1.15.8.3-2-xenial + build: + context: ./docker/nginx + dockerfile: Dockerfile container_name: nginx restart: unless-stopped logging: *default-logging diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile new file mode 100644 index 00000000..71e45a70 --- /dev/null +++ b/docker/nginx/Dockerfile @@ -0,0 +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 + +# CMD ["sh", "-c", "service cron start;", "/usr/local/openresty/bin/openresty -g daemon off;"] +CMD ["/usr/local/openresty/bin/openresty", "-g", "daemon off;"] From 2d23066c4e233094e03ea241871c8f5a1216bb35 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Sun, 10 Jan 2021 13:03:25 +0100 Subject: [PATCH 2/3] use marstorage as dapp example --- packages/webapp/src/components/HomeSamples/HomeSamples.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webapp/src/components/HomeSamples/HomeSamples.js b/packages/webapp/src/components/HomeSamples/HomeSamples.js index 80c576e4..e1ff82e4 100644 --- a/packages/webapp/src/components/HomeSamples/HomeSamples.js +++ b/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() { From 83a2170afc194d7f2612171c25898fdcf40ded8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Wypch=C5=82o?= Date: Wed, 13 Jan 2021 12:42:49 +0100 Subject: [PATCH 3/3] upgrade sia to 1.5.4 (#582) * upgrade sia to 1.5.4 * bump builder image --- docker-compose.yml | 2 +- docker/sia/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ba3001c1..4f27b087 100644 --- a/docker-compose.yml +++ b/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 diff --git a/docker/sia/Dockerfile b/docker/sia/Dockerfile index 66b12403..0c9233b1 100644 --- a/docker/sia/Dockerfile +++ b/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/