diff --git a/docker/Dockerfile b/docker/Dockerfile index 624a709..1911079 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -22,5 +22,7 @@ COPY docker-entrypoint.sh / COPY database.conf ./ +RUN chmod +x /docker-entrypoint.sh + ENTRYPOINT ["/docker-entrypoint.sh"] CMD java -jar $GITBUCKET_HOME/latest.war --host=$GITBUCKET_HOST --port=$GITBUCKET_PORT --gitbucket.home=$GITBUCKET_HOME diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 8a31fe6..5b4421f 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -1,11 +1,9 @@ #!/bin/bash # replace mysql settings in config file -dbfile=${GITBUCKET_HOME}/database.config +dbfile=${GITBUCKET_HOME}/database.conf sed -i "/GITBUCKET_DATABASE_NAME/c\\${GITBUCKET_DATABASE_NAME};" $dbfile sed -i "/GITBUCKET_DATABASE_HOST/c\\${GITBUCKET_DATABASE_HOST};" $dbfile sed -i "/GITBUCKET_DATABASE_PASSWORD/c\\${GITBUCKET_DATABASE_PASSWORD};" $dbfile sed -i "/GITBUCKET_DATABASE_USER/c\\${GITBUCKET_DATABASE_USER};" $dbfile - -# start gitbucket