Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
digibib
koha-docker
Commits
b45c1aa4
Commit
b45c1aa4
authored
Jun 14, 2018
by
Benjamin Rokseth
Browse files
entrypoint: make optional
parent
7bcfa833
Changes
2
Hide whitespace changes
Inline
Side-by-side
docker-compose/ci.yml
View file @
b45c1aa4
...
...
@@ -25,7 +25,6 @@ services:
KOHA_ADMINPASS
:
"
${KOHA_ADMINPASS:-secret}"
KOHA_ADMINUSER
:
"
${KOHA_ADMINUSER:-admin}"
KOHA_INSTANCE
:
"
${KOHA_INSTANCE:-name}"
KOHA_DBHOST
:
koha_mysql
INSTALL_LANGUAGES
:
"
${INSTALL_LANGUAGES}"
DEFAULT_LANGUAGE
:
"
${DEFAULT_LANGUAGE}"
EMAIL_ENABLED
:
"
True"
...
...
docker-entrypoint.sh
View file @
b45c1aa4
...
...
@@ -14,10 +14,10 @@ echo "Setting up supervisord ..."
envsubst < /templates/global/supervisord.conf.tmpl
>
/etc/supervisor/conf.d/supervisord.conf
echo
"Mysql server setup ..."
if
ping
-c
1
-W
1
$KOHA_DBHOST
;
then
if
[
-z
$KOHA_DBHOST
&&
ping
-c
1
-W
1
$KOHA_DBHOST
]
;
then
printf
"Using linked mysql container
$KOHA_DBHOST
\n
"
else
printf
"
U
nable to connect to linked mysql
container
$KOHA_DBHOST
\n
-- initializing local mysql ...
\n
"
printf
"
No linked mysql or u
nable to connect to linked mysql
$KOHA_DBHOST
\n
-- initializing local mysql ...
\n
"
/etc/init.d/mysql start
sleep
1
# waiting for mysql to spin up on slow computers
echo
"127.0.0.1
$KOHA_DBHOST
"
>>
/etc/hosts
...
...
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