Skip to content

Commit

Permalink
Merge branch 'develop' into master-to-develop-after-1200
Browse files Browse the repository at this point in the history
  • Loading branch information
minump authored Sep 6, 2023
2 parents e4b1227 + 167af69 commit c4be6b7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ FROM swaggerapi/swagger-ui:v4.13.2

COPY appconfigservice/appconfig.yaml eventservice/events.yaml profileservice/profile.yaml loggingservice/logging.yaml /usr/share/nginx/html/app/

ENV URLS "[{url: 'app/appconfig.yaml', name: 'App Config Building Block'}, {url: 'app/auth.yaml', name: 'Authentication Building Block'}, {url: 'app/events.yaml', name: 'Events Building Block'}, {url: 'app/profile.yaml', name: 'Profile Building Block'}, {url: 'app/logging.yaml', name: 'Logging Building Block'}, {url: 'https://api.rokwire.illinois.edu/health/doc', name: 'Health Building Block'}, {url: 'https://api.rokwire.illinois.edu/talent-chooser/doc', name: 'Talent Chooser Building Block'} ]"
ENV URLS "[{url: 'app/appconfig.yaml', name: 'App Config Building Block'}, {url: 'app/auth.yaml', name: 'Authentication Building Block'}, {url: 'app/events.yaml', name: 'Events Building Block'}, {url: 'app/profile.yaml', name: 'Profile Building Block'}, {url: 'app/logging.yaml', name: 'Logging Building Block'}, {url: 'https://api-dev.rokwire.illinois.edu/health/doc', name: 'Health Building Block'}, {url: 'https://api-dev.rokwire.illinois.edu/talent-chooser/doc', name: 'Talent Chooser Building Block'} ]"

VOLUME /usr/share/nginx/html/app/
1 change: 0 additions & 1 deletion contributions/catalog/webapps/static/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,6 @@ input[type=checkbox]:checked:focus, input[type=checkbox]:not(:checked):focus{
}



.button3 {
color: white;
display: inline-block;
Expand Down

0 comments on commit c4be6b7

Please sign in to comment.