diff --git a/ops/nginx/conf.d.dev/filterlists.conf b/ops/nginx/conf.d.dev/filterlists.conf index a2caf041b..80a48ce9d 100644 --- a/ops/nginx/conf.d.dev/filterlists.conf +++ b/ops/nginx/conf.d.dev/filterlists.conf @@ -16,7 +16,7 @@ server { } location / { - proxy_pass http://web:3000; + proxy_pass http://web:5000; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; diff --git a/ops/nginx/conf.d/filterlists.conf b/ops/nginx/conf.d/filterlists.conf index 5802df8d0..a5aae5cee 100644 --- a/ops/nginx/conf.d/filterlists.conf +++ b/ops/nginx/conf.d/filterlists.conf @@ -20,7 +20,7 @@ server { } location / { - proxy_pass http://web:3000; + proxy_pass http://web:5000; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; diff --git a/src/FilterLists.Web/Dockerfile b/src/FilterLists.Web/Dockerfile index 6e15a90bb..cfb0962cd 100644 --- a/src/FilterLists.Web/Dockerfile +++ b/src/FilterLists.Web/Dockerfile @@ -2,14 +2,24 @@ # Command: docker build -f src/FilterLists.Web/Dockerfile . # init base -FROM node:alpine as final -CMD ["npm", "start"] +FROM node:alpine as base EXPOSE 3000 WORKDIR /usr/app/ +ENTRYPOINT ["serve", "-s"] +RUN npm install -g serve + +# init build +FROM node:alpine as build # install -COPY src/web/package*.json ./ +WORKDIR /usr/src/app/ +COPY src/FilterLists.Web/package*.json ./ RUN npm install --only=prod +# build +COPY src/FilterLists.Web/. ./ +RUN npm run build + # final -COPY src/web/. ./ \ No newline at end of file +FROM base as final +COPY --from=build /usr/src/app/build ./ \ No newline at end of file