Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
web-app
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
web-et-numerique-internet
data.grandlyon.com
web-portal
components
custom-apps
web-app
Commits
2d694197
Commit
2d694197
authored
7 years ago
by
ncastejon
Browse files
Options
Downloads
Patches
Plain Diff
Fix redirect on flag click - Change nginx docker server name for elasticsearch
parent
4b135924
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Dockerfile
+4
-1
4 additions, 1 deletion
Dockerfile
proxy.conf
+1
-1
1 addition, 1 deletion
proxy.conf
webapp/src/environments/environment.ts
+2
-2
2 additions, 2 deletions
webapp/src/environments/environment.ts
with
7 additions
and
4 deletions
Dockerfile
+
4
−
1
View file @
2d694197
...
...
@@ -7,7 +7,10 @@ COPY ./webapp /app/webapp
WORKDIR
/app/webapp
# Install npm dependencies
RUN
npm
install
RUN
npm rebuild node-sass
# For windows environment, with already a node_modules folder, we need reinstall the node-sass package
#RUN npm rebuild node-sass
# Building the Angular app /dist i18n
RUN
npm run build-i18n
...
...
This diff is collapsed.
Click to expand it.
proxy.conf
+
1
−
1
View file @
2d694197
server
{
listen
80
;
server_name
_
;
server_name
localhost
;
location
/ {
proxy_pass
https
://
elastic2
.
recette
.
data
.
grandlyon
.
com
/
elastic
/;
...
...
This diff is collapsed.
Click to expand it.
webapp/src/environments/environment.ts
+
2
−
2
View file @
2d694197
...
...
@@ -12,7 +12,7 @@ export const environment = {
},
angularAppHost
:
{
fr
:
'
http://localhost:8080
/fr
'
,
en
:
'
http://localhost:8080
/en
'
fr
:
'
/fr
'
,
en
:
'
/en
'
}
};
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment