diff --git a/.dockerignore b/.dockerignore index c4b1a684d..cbf42b71f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -18,7 +18,6 @@ **/Dockerfile* **/node_modules **/npm-debug.log -**/www **/secrets.dev.yaml **/values.dev.yaml LICENSE diff --git a/dockerfile b/dockerfile index 719543f90..750b12e42 100644 --- a/dockerfile +++ b/dockerfile @@ -1,15 +1,15 @@ -FROM node:14 as build -WORKDIR /app -COPY ./package*.json /app/ -RUN npm config set unsafe-perm true -RUN npm install -g ionic -RUN npm config set legacy-peer-deps true -RUN npm i -D typescript@4.3.5 -RUN npm install --save --legacy-peer-deps -COPY ./ /app/ -RUN ionic build --prod +# FROM node:14 as build +# WORKDIR /app +# COPY ./package*.json /app/ +# RUN npm config set unsafe-perm true +# RUN npm install -g ionic +# RUN npm config set legacy-peer-deps true +# RUN npm i -D typescript@4.3.5 +# RUN npm install --save --legacy-peer-deps +# COPY ./ /app/ +# RUN ionic build --prod FROM nginx:alpine COPY ./nginx/default.conf /etc/nginx/conf.d/default.conf RUN rm -rf /usr/share/nginx/html/* -COPY --from=build /app/www/ /usr/share/nginx/html/ \ No newline at end of file +COPY /www/ /usr/share/nginx/html/ \ No newline at end of file diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index e7f073030..4c473fd14 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -18,9 +18,9 @@
- +