Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
ntnu-beta-web
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Simen Vevik
ntnu-beta-web
Commits
f265f017
Commit
f265f017
authored
5 years ago
by
Simen Vevik
Browse files
Options
Downloads
Patches
Plain Diff
Open port 80 on client so it can redirect http to https
parent
86bf05b4
No related branches found
No related tags found
1 merge request
!4
Dev
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
client/Dockerfile
+2
-2
2 additions, 2 deletions
client/Dockerfile
docker-compose.yml
+1
-0
1 addition, 0 deletions
docker-compose.yml
with
3 additions
and
2 deletions
client/Dockerfile
+
2
−
2
View file @
f265f017
...
@@ -48,7 +48,7 @@ RUN echo "LoadModule rewrite_module modules/mod_rewrite.so" >> /usr/local/apache
...
@@ -48,7 +48,7 @@ RUN echo "LoadModule rewrite_module modules/mod_rewrite.so" >> /usr/local/apache
RUN
echo
"ServerName beta-katalog.it.ntnu.no"
>>
/usr/local/apache2/conf/httpd.conf
RUN
echo
"ServerName beta-katalog.it.ntnu.no"
>>
/usr/local/apache2/conf/httpd.conf
### 2.5 Open ports and start apache
### 2.5 Open ports and start apache
# Open the container port
to listen to 443
# Open the container port
s
EXPOSE
443
EXPOSE
443
80
# Start apache webserver
# Start apache webserver
CMD
["apachectl", "-D", "FOREGROUND"]
CMD
["apachectl", "-D", "FOREGROUND"]
\ No newline at end of file
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
1
−
0
View file @
f265f017
...
@@ -41,6 +41,7 @@ services:
...
@@ -41,6 +41,7 @@ services:
restart
:
always
restart
:
always
ports
:
ports
:
-
"
443:443"
-
"
443:443"
-
"
80:80"
volumes
:
volumes
:
-
./client:/client
-
./client:/client
-
/client/node_modules
-
/client/node_modules
...
...
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