From ac66d90a33c653c5e1b159619291be632d0f1694 Mon Sep 17 00:00:00 2001
From: kerashanog <kerashanog@gmail.com>
Date: Fri, 6 Oct 2023 09:14:53 +0700
Subject: [PATCH 1/3] Replace node image in dockerfile with official one

---
 .dockerignore |  2 ++
 Dockerfile    | 52 +++++++++++++++++++++++++++------------------------
 2 files changed, 30 insertions(+), 24 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..c1da1247e
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+screenshots/*
+screenshots*
diff --git a/Dockerfile b/Dockerfile
index 4eeb450cf..868234023 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,28 @@
-# Stremio Node 14.x
-FROM stremio/node-base:fermium
-
-# Meta
-LABEL Description="Stremio Web" Vendor="Smart Code OOD" Version="1.0.0"
-
-# Update GitHub remote host key
-RUN echo "github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=" >> ~/.ssh/known_hosts
-
-# Create app directory
-RUN mkdir -p /var/www/stremio-web
-
-# Install app dependencies
-WORKDIR /var/www/stremio-web
-COPY . /var/www/stremio-web
-RUN npm install 
-
-# Bundle app source
-WORKDIR /var/www/stremio-web
-
-RUN npm run build 
-
-EXPOSE 8080
-CMD ["node", "http_server.js"]
+# Stremio Node 14.x
+# the node version for running Stremio Web
+ARG NODE_VERSION=15-alpine
+FROM node:$NODE_VERSION AS base
+
+# Meta
+LABEL Description="Stremio Web" Vendor="Smart Code OOD" Version="1.0.0"
+
+RUN apk update && apk upgrade && \
+    apk add --no-cache git
+RUN mkdir -p /var/www/stremio-web
+WORKDIR /var/www/stremio-web
+
+# Install app dependencies
+FROM base AS prebuild
+
+WORKDIR /var/www/stremio-web
+COPY ./package*.json ./
+RUN npm install
+
+# Bundle app source
+FROM prebuild AS final
+
+WORKDIR /var/www/stremio-web
+COPY . .
+RUN npm run build
+EXPOSE 8080
+CMD ["node", "http_server.js"]

From df60ec74f01ef484765761d3c96b293cd1125c29 Mon Sep 17 00:00:00 2001
From: kerashanog <kerashanog@gmail.com>
Date: Fri, 6 Oct 2023 12:20:01 +0700
Subject: [PATCH 2/3] Optimize prebuild stage

---
 Dockerfile | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 868234023..ad89aba5e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,23 +6,29 @@ FROM node:$NODE_VERSION AS base
 # Meta
 LABEL Description="Stremio Web" Vendor="Smart Code OOD" Version="1.0.0"
 
-RUN apk update && apk upgrade && \
-    apk add --no-cache git
 RUN mkdir -p /var/www/stremio-web
 WORKDIR /var/www/stremio-web
 
 # Install app dependencies
 FROM base AS prebuild
 
+RUN apk update && apk upgrade && \
+    apk add --no-cache git
+
+RUN mkdir -p /var/www/stremio-web
 WORKDIR /var/www/stremio-web
-COPY ./package*.json ./
+
+COPY . .
 RUN npm install
+RUN npm run build
 
 # Bundle app source
-FROM prebuild AS final
+FROM base AS final
 
 WORKDIR /var/www/stremio-web
 COPY . .
-RUN npm run build
+COPY --from=prebuild /var/www/stremio-web/node_modules ./node_modules
+COPY --from=prebuild /var/www/stremio-web/build ./build
+
 EXPOSE 8080
 CMD ["node", "http_server.js"]

From 560a27ac249446ed671fb4cc0154409b0160f5b0 Mon Sep 17 00:00:00 2001
From: kerashanog <kerashanog@gmail.com>
Date: Fri, 6 Oct 2023 12:22:51 +0700
Subject: [PATCH 3/3] Remove unuse step

---
 Dockerfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ad89aba5e..2febdd65f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,10 +14,7 @@ FROM base AS prebuild
 
 RUN apk update && apk upgrade && \
     apk add --no-cache git
-
-RUN mkdir -p /var/www/stremio-web
 WORKDIR /var/www/stremio-web
-
 COPY . .
 RUN npm install
 RUN npm run build