Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
anis-client
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
anis
anis-client
Commits
c66c3e63
Commit
c66c3e63
authored
5 years ago
by
François Agneray
Browse files
Options
Downloads
Plain Diff
Merge branch '37-ajout-du-fichier-config-nginx-dans-l-image-docker' into 'develop'
#37
done Closes
#37
See merge request
!25
parents
9b0f2283
482a4b73
No related branches found
No related tags found
2 merge requests
!68
Develop
,
!25
#37 done
Pipeline
#1312
passed
5 years ago
Stage: install
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+2
-1
2 additions, 1 deletion
Dockerfile
conf-dev/nginx.conf
+10
-0
10 additions, 0 deletions
conf-dev/nginx.conf
with
12 additions
and
1 deletion
Dockerfile
+
2
−
1
View file @
c66c3e63
FROM
nginx
COPY
dist/anis-client /usr/share/nginx/html
\ No newline at end of file
COPY
dist/anis-client /usr/share/nginx/html
COPY
conf-dev/nginx.conf /etc/nginx/conf.d/default.conf
\ No newline at end of file
This diff is collapsed.
Click to expand it.
conf-dev/nginx.conf
0 → 100644
+
10
−
0
View file @
c66c3e63
server
{
listen
80
;
server_name
localhost
;
root
/usr/share/nginx/html
;
location
/
{
try_files
$uri
$uri
/
/index.html
;
}
}
\ No newline at end of file
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