Skip to content

S
SMART
Commit a5bd7856 authored by Alfonso Orta's avatar Alfonso Orta
Browse files
Options

Merge branch 'develop' into 'staging' 

fixed failing builds

See merge request !47
parents 69949920 13427b9e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/demo/dashboard/Dockerfile
View file @ a5bd7856
...@@ -5,5 +5,5 @@ EXPOSE 443 ...@@ -5,5 +5,5 @@ EXPOSE 443
ENV http_proxy http://proxy.uni-klu.ac.at:3128/ ENV http_proxy http://proxy.uni-klu.ac.at:3128/
ENV https_proxy http://proxy.uni-klu.ac.at:3128/ ENV https_proxy http://proxy.uni-klu.ac.at:3128/
COPY ./src/dashboard/deployment/nginx.conf /etc/nginx/conf.d/default.conf COPY src/demo/dashboard/deployment/nginx.conf /etc/nginx/conf.d/default.conf
COPY ./src/dashboard/build/web/ /usr/share/nginx/html/ COPY src/demo/dashboard/build/web/ /usr/share/nginx/html/
\ No newline at end of file \ No newline at end of file
src/rest-gateway/Dockerfile
View file @ a5bd7856
...@@ -9,10 +9,10 @@ EXPOSE 5000 ...@@ -9,10 +9,10 @@ EXPOSE 5000
WORKDIR /app WORKDIR /app
COPY src/data-hub/reputation-calculation-microservice/app/requirements.txt /app/ COPY src/rest-gateway/app/requirements.txt /app/
RUN pip install -r requirements.txt RUN pip install -r requirements.txt
COPY src/data-hub/reputation-calculation-microservice/app/ /app/ COPY src/rest-gateway/app/ /app/
COPY src/modules/ /app/ COPY src/modules/ /app/
RUN chmod a+x main.py RUN chmod a+x main.py
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment