Skip to content
This repository has been archived by the owner on Apr 16, 2021. It is now read-only.

Commit

Permalink
using apache
Browse files Browse the repository at this point in the history
  • Loading branch information
Frederic Lavigne committed Oct 3, 2018
1 parent 4cdc218 commit b6a6134
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
13 changes: 3 additions & 10 deletions onestep.Dockerfile
Original file line number Diff line number Diff line change
@@ -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 . .
Expand All @@ -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/
11 changes: 11 additions & 0 deletions src/static/.htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<IfModule mod_rewrite.c>

RewriteEngine On
RewriteBase /
RewriteRule ^index\.html$ - [L]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-l
RewriteRule . /index.html [L]

</IfModule>

0 comments on commit b6a6134

Please sign in to comment.