Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo-1
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo-1
Commits
bc7337ee
Unverified
Commit
bc7337ee
authored
Jun 06, 2018
by
D
Committed by
GitHub
Jun 06, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12465 from hging/master
fix can't custom server port use docker environment
parents
5c5c3906
e0ff56e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
src/main/resources/docker/entrypoint.sh
src/main/resources/docker/entrypoint.sh
+2
-1
src/main/resources/docker/latke.properties
src/main/resources/docker/latke.properties
+1
-1
No files found.
src/main/resources/docker/entrypoint.sh
View file @
bc7337ee
...
...
@@ -38,8 +38,9 @@ if [ ! -f "/opt/b3log/solo/WEB-INF/classes/local.properties" ]; then
cat
/opt/b3log/tmp/latke.properties |
sed
\
-e
"s|{{SERVER_SCHMEA}}|
${
SERVER_SCHMEA
:-
http
}
|g"
\
-e
"s|{{SERVER_NAME}}|
${
SERVER_NAME
:-
localhost
}
|g"
\
-e
"s|{{SERVER_PORT}}|
${
SERVER_PORT
:-
8080
}
|g"
\
>
/opt/b3log/solo/WEB-INF/classes/latke.properties
cat
/opt/b3log/tmp/mail.properties |
sed
\
-e
"s|{{EMAIL_ADDRESS}}|
${
EMAIL_ADDRESS
}
|g"
\
-e
"s|{{EMAIL_PASSWORD}}|
${
EMAIL_PASSWORD
}
|g"
\
...
...
src/main/resources/docker/latke.properties
View file @
bc7337ee
...
...
@@ -28,7 +28,7 @@ serverScheme={{SERVER_SCHMEA}}
# Browser visit domain name
serverHost
=
{{SERVER_NAME}}
# Browser visit port, 80 as usual, THIS IS NOT SERVER LISTEN PORT!
serverPort
=
8080
serverPort
=
{{SERVER_PORT}}
#### Cookie ####
cookieName
=
solo
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment