diff --git a/onestep.Dockerfile b/onestep.Dockerfile index 896bba6..103ac22 100644 --- a/onestep.Dockerfile +++ b/onestep.Dockerfile @@ -1,8 +1,9 @@ # build -FROM nginx:stable +FROM httpd:2.4 ARG CONTROLLER_SERVICE=http://lw-controller:8080 ENV CONTROLLER_SERVICE="${CONTROLLER_SERVICE}" +RUN echo "Using ${CONTROLLER_SERVICE}" WORKDIR /app COPY . . @@ -17,12 +18,4 @@ RUN apt-get update \ && rm -rf node_modules \ && apt-get remove -y python build-essential nodejs curl gnupg -# RUN apk add --no-cache --virtual .build-deps nodejs alpine-sdk python \ -# && npm install \ -# && npm run deploy:prod \ -# && apk del .build-deps - -RUN cp /app/dist/docker-nginx.conf /etc/nginx/conf.d/default.conf -RUN mv /app/dist/ /var/www/ - -CMD ["nginx", "-g", "daemon off;"] +RUN mv /app/dist/ /usr/local/apache2/htdocs/ diff --git a/src/static/.htaccess b/src/static/.htaccess new file mode 100644 index 0000000..3fa8a40 --- /dev/null +++ b/src/static/.htaccess @@ -0,0 +1,11 @@ + + + RewriteEngine On + RewriteBase / + RewriteRule ^index\.html$ - [L] + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_FILENAME} !-l + RewriteRule . /index.html [L] + +