Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Mumble Web
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
Armin Co
Mumble Web
Commits
9a748ac9
Commit
9a748ac9
authored
4 years ago
by
Armin Co
Browse files
Options
Downloads
Patches
Plain Diff
Added nginx container
parent
2005baaa
No related branches found
No related tags found
1 merge request
!1
Feature nginx.
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
build_mumble_web.sh
+3
-2
3 additions, 2 deletions
build_mumble_web.sh
webserver/Dockerfile.nginx
+6
-2
6 additions, 2 deletions
webserver/Dockerfile.nginx
webserver/conf/nginx.conf
+2
-2
2 additions, 2 deletions
webserver/conf/nginx.conf
webserver/entrypoint.sh
+1
-4
1 addition, 4 deletions
webserver/entrypoint.sh
with
12 additions
and
10 deletions
build_mumble_web.sh
+
3
−
2
View file @
9a748ac9
...
@@ -38,7 +38,7 @@ verify_commit_HEAD
...
@@ -38,7 +38,7 @@ verify_commit_HEAD
# build docker image
# build docker image
printf
"
\n
Building image
\n
"
printf
"
\n
Building image
\n
"
docker build
-t
$IMAGE_NAME
.
>
build.log
docker build
-t
$IMAGE_NAME
-f
Dockerfile.mumble-web
.
>
build.log
# create temporary container
# create temporary container
docker create
--name
$CONTAINER_NAME
"
${
IMAGE_NAME
}
"
docker create
--name
$CONTAINER_NAME
"
${
IMAGE_NAME
}
"
# remove previously copied files
# remove previously copied files
...
@@ -56,5 +56,6 @@ fi
...
@@ -56,5 +56,6 @@ fi
if
[
$RUN_TEST
==
"true"
]
if
[
$RUN_TEST
==
"true"
]
then
then
docker run
--rm
-d
-p
443:443
--name
mumble-web-nginx-test
$IMAGE_NAME
docker build
-t
"
${
IMAGE_NAME
}
_nginx"
-f
webserver/Dockerfile.nginx
.
docker run
--rm
-d
-p
443:443
--name
"
${
CONTAINER_NAME
}
_nginx"
"
${
IMAGE_NAME
}
_nginx"
fi
fi
\ No newline at end of file
This diff is collapsed.
Click to expand it.
webserver/Dockerfile.nginx
+
6
−
2
View file @
9a748ac9
...
@@ -2,10 +2,14 @@ FROM build_mumble_web_image
...
@@ -2,10 +2,14 @@ FROM build_mumble_web_image
USER root
USER root
RUN apk add --no-cache nginx && \
RUN apk add --no-cache
bash
nginx && \
adduser -D -g 'www' www && \
adduser -D -g 'www' www && \
mkdir /config
mkdir /config
EXPOSE 443
EXPOSE 443
COPY webserver/entrypoint.sh /
COPY webserver/ /config
CMD ./config/entrypoint.sh
\ No newline at end of file
RUN chmod +x /entrypoint.sh
CMD /bin/bash ./entrypoint.sh
\ No newline at end of file
This diff is collapsed.
Click to expand it.
webserver/conf/nginx.conf
+
2
−
2
View file @
9a748ac9
...
@@ -17,8 +17,8 @@ http {
...
@@ -17,8 +17,8 @@ http {
server
{
server
{
listen
443
ssl
;
listen
443
ssl
;
server_name
localhost
;
server_name
localhost
;
ssl_certificate
/
home/node
/test.crt
;
ssl_certificate
/
config/certs
/test.crt
;
ssl_certificate_key
/
home/node
/test.key
;
ssl_certificate_key
/
config/certs
/test.key
;
location
/
{
location
/
{
root
/home/node/dist
;
root
/home/node/dist
;
...
...
This diff is collapsed.
Click to expand it.
webserver/entrypoint.sh
100644 → 100755
+
1
−
4
View file @
9a748ac9
#!bin/bash
mv
/config/conf/nginx.conf /etc/nginx/nginx.conf
;
mv
/config/nginx.conf /etc/nginx/nginx.conf
nginx
-g
'daemon off;'
;
nginx
-s
reload
;
nginx
-g
'daemon off;'
;
nginx
-s
reload
;
\ 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