From 45601bd2f02ff38909975f1c1dc84c9de19314fc Mon Sep 17 00:00:00 2001 From: Gareth Murphy Date: Wed, 18 Jul 2018 15:22:25 +0200 Subject: [PATCH] remove proxy --- Dockerfile | 7 ------- Dockerfile.proxy | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 Dockerfile.proxy diff --git a/Dockerfile b/Dockerfile index 1e25f9ab..d06a0c62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,13 +8,6 @@ WORKDIR /landing COPY package.json . -ENV http_proxy "http://192.168.1.1:8123" -ENV https_proxy $http_proxy -ENV no_proxy "localhost, 127.0.0.1" -RUN npm config set proxy $http_proxy -RUN npm config set https-proxy $http_proxy -RUN npm config set registry http://registry.npmjs.org/ -RUN npm config set strict-ssl false RUN npm install diff --git a/Dockerfile.proxy b/Dockerfile.proxy new file mode 100644 index 00000000..1e25f9ab --- /dev/null +++ b/Dockerfile.proxy @@ -0,0 +1,38 @@ +FROM mhart/alpine-node:8 + +RUN mkdir /usr/html +RUN mkdir /landing +WORKDIR /landing + + + +COPY package.json . + +ENV http_proxy "http://192.168.1.1:8123" +ENV https_proxy $http_proxy +ENV no_proxy "localhost, 127.0.0.1" +RUN npm config set proxy $http_proxy +RUN npm config set https-proxy $http_proxy +RUN npm config set registry http://registry.npmjs.org/ +RUN npm config set strict-ssl false + +RUN npm install + +COPY src src +COPY angular.json . +COPY tsconfig.json . +COPY webpack.server.config.js . +COPY server.ts . + +ARG APP_PROD='true' +ARG LB_BASE_URL='http://localhost/api' +ARG LB_API_VERSION='' + +RUN npm install http-server -g + + +RUN npm run build:ssr + +WORKDIR /landing/dist/browser +EXPOSE 8080 +CMD ["http-server"]