Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Dockerfiles
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
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
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Picasoft
Technique
Dockerfiles
Commits
c25ae68f
Verified
Commit
c25ae68f
authored
5 years ago
by
Quentin Duchemin
Browse files
Options
Downloads
Patches
Plain Diff
Remove jq call in entrypoint and fix networking
parent
2b986d27
No related branches found
Branches containing commit
No related tags found
1 merge request
!44
Optimize CI and remove deployment steps, add Mattermost and update Etherpad
Pipeline
#52089
passed
5 years ago
Stage: ci-base
Stage: build
Stage: security-tests
Stage: push
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pica-mattermost/docker-compose.yml
+6
-0
6 additions, 0 deletions
pica-mattermost/docker-compose.yml
pica-mattermost/entrypoint.sh
+1
-3
1 addition, 3 deletions
pica-mattermost/entrypoint.sh
with
7 additions
and
3 deletions
pica-mattermost/docker-compose.yml
+
6
−
0
View file @
c25ae68f
...
...
@@ -33,6 +33,10 @@ services:
-
"
traefik.port=8000"
-
"
traefik.frontend.passHostHeader=true"
-
"
traefik.enable=true"
networks
:
-
docker_default
depends_on
:
-
mattermost-db
restart
:
unless-stopped
mattermost-db
:
...
...
@@ -42,4 +46,6 @@ services:
-
mattermost-db:/var/lib/postgresql/data
-
/etc/localtime:/etc/localtime:ro
env_file
:
./secrets/mattermost-db.secrets
networks
:
-
docker_default
restart
:
unless-stopped
This diff is collapsed.
Click to expand it.
pica-mattermost/entrypoint.sh
+
1
−
3
View file @
c25ae68f
...
...
@@ -15,9 +15,7 @@ if [ "$1" = 'mattermost' ]; then
if
[[
-z
"
$MM_SQLSETTINGS_DATASOURCE
"
&&
!
-z
"
$MM_USERNAME
"
&&
!
-z
"
$MM_PASSWORD
"
]]
then
echo
-ne
"Configure database connection..."
# URLEncode the password, allowing for special characters
ENCODED_PASSWORD
=
$(
printf
%s
$MM_PASSWORD
| jq
-s
-R
-r
@uri
)
export
MM_SQLSETTINGS_DATASOURCE
=
"postgres://
$MM_USERNAME
:
$ENCODED_PASSWORD
@
$DB_HOST
:
$DB_PORT_NUMBER
/
$MM_DBNAME
?sslmode=disable&connect_timeout=10"
export
MM_SQLSETTINGS_DATASOURCE
=
"postgres://
$MM_USERNAME
:
$MM_PASSWORD
@
$DB_HOST
:
$DB_PORT_NUMBER
/
$MM_DBNAME
?sslmode=disable&connect_timeout=10"
echo
OK
else
echo
"Using existing database connection"
...
...
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