Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SMART
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UNI-KLU
SMART
Commits
a5bd7856
Commit
a5bd7856
authored
Aug 02, 2021
by
Alfonso Orta
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into 'staging'
fixed failing builds See merge request
!47
parents
69949920
13427b9e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
Dockerfile
src/demo/dashboard/Dockerfile
+2
-2
Dockerfile
src/rest-gateway/Dockerfile
+2
-2
No files found.
src/demo/dashboard/Dockerfile
View file @
a5bd7856
...
...
@@ -5,5 +5,5 @@ EXPOSE 443
ENV
http_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/dashboard/build/web/ /usr/share/nginx/html/
\ No newline at end of file
COPY
src/demo/dashboard/deployment/nginx.conf /etc/nginx/conf.d/default.conf
COPY
src/demo/dashboard/build/web/ /usr/share/nginx/html/
\ No newline at end of file
src/rest-gateway/Dockerfile
View file @
a5bd7856
...
...
@@ -9,10 +9,10 @@ EXPOSE 5000
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
COPY
src/
data-hub/reputation-calculation-microservice
/app/ /app/
COPY
src/
rest-gateway
/app/ /app/
COPY
src/modules/ /app/
RUN
chmod
a+x main.py
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment