mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2024-06-07 19:40:43 +00:00
Merged branch master into master
This commit is contained in:
commit
1e1a572227
@ -9,13 +9,7 @@ apply_base_data() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
apply_config() {
|
apply_config() {
|
||||||
for p in /config/*.properties; do
|
cp -rf /config/* $GITBLIT_BASE_FOLDER
|
||||||
echo "
|
|
||||||
APPLYING configuration file $p
|
|
||||||
"
|
|
||||||
cp $p $GITBLIT_BASE_FOLDER
|
|
||||||
mv $p ${p}.applied
|
|
||||||
done
|
|
||||||
}
|
}
|
||||||
|
|
||||||
create_repo() {
|
create_repo() {
|
||||||
@ -81,12 +75,23 @@ create_initial_repo() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
shopt -s nullglob
|
shopt -s nullglob
|
||||||
apply_base_data
|
if [ ! -f /var/local/gitblit_firststart ]; then
|
||||||
|
FIRSTSTART=1
|
||||||
if [ -d /config ]; then
|
else
|
||||||
apply_config
|
FIRSTSTART=0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ $FIRSTSTART = 1 ]; then
|
||||||
|
apply_base_data
|
||||||
|
|
||||||
|
echo "
|
||||||
|
Applying configuration from /config
|
||||||
|
"
|
||||||
|
apply_config
|
||||||
|
touch /var/local/gitblit_firststart
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [[ -n $GITBLIT_INITIAL_REPO ]]; then
|
if [[ -n $GITBLIT_INITIAL_REPO ]]; then
|
||||||
create_initial_repo
|
create_initial_repo
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user