diff --git a/.gitignore b/.gitignore index 8a943b0f..d19222f6 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ eslintrc.json .eslintcache request.http +.project \ No newline at end of file diff --git a/dockerfile b/dockerfile index 53b4b551..0bcc1461 100644 --- a/dockerfile +++ b/dockerfile @@ -8,23 +8,27 @@ COPY . . RUN mkdir /ui-cert /ui-key && npm install #RUN npm i -S -g serve -RUN npm run build || cat /root/.npm/_logs/* +RUN npm rebuild node-sass +RUN npm run build FROM nginx:1.19.5-perl - +RUN apt-get -y update +RUN apt-get install -y dos2unix +RUN apt-get install -y wget COPY nginx.conf /etc/nginx/conf.d/default.conf COPY main.conf /etc/nginx/nginx.conf +RUN dos2unix /etc/nginx/conf.d/default.conf +RUN dos2unix /etc/nginx/nginx.conf WORKDIR /usr/share/nginx/html COPY ./env.sh . - +RUN dos2unix /usr/share/nginx/html/env.sh RUN chmod +x env.sh COPY --from=build /usr/src/app/build/ /usr/share/nginx/html RUN mkdir public EXPOSE 80 -RUN apt-get -y update && apt-get install -y wget RUN wget https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-linux-amd64-v0.6.1.tar.gz RUN tar -C /usr/local/bin -xzf dockerize-linux-amd64-v0.6.1.tar.gz