Merge branch 'master' of https://github.com/lepbase/easy-mirror-docker

Dockerfile

@@ -202,7 +202,6 @@ USER eguser
 COPY update.sh /ensembl/scripts/
 COPY default.setup.ini /ensembl/conf/setup.ini
 RUN /ensembl/scripts/update.sh /ensembl/conf/setup.ini
-COPY placeholder-* /ensembl/conf/
 COPY *.sh /ensembl/scripts/
 
 WORKDIR /ensembl

database.sh

@@ -101,9 +101,9 @@ function load_db(){
 
   # load sql into database
   $ROOT_CONNECT $NAME < $DB/$DB.sql
-
   # load data into database
-  if [ -s "$DB/*.txt.gz" ]; then
+
+  if ls $DB/*.txt.gz 1> /dev/null 2>&1; then
     for ZIPPED_FILE in $DB/*.txt.gz
     do
       gunzip $ZIPPED_FILE

update.sh

@@ -278,6 +278,7 @@ do
   printf "DATABASE_CORE = $DB\n#OTHER_DATABASES\n\n" >> $SERVER_ROOT/public-plugins/mirror/conf/ini-files/$SP_UC_FIRST.ini
   # !add database connection parameters to Genus_species.ini
   printf "\n[DATABASE_CORE]\nHOST = $TEST_HOST\nPORT = $TEST_PORT\nUSER = $TEST_USER\nPASS = $TEST_PASS\n" >> $SERVER_ROOT/public-plugins/mirror/conf/ini-files/$SP_UC_FIRST.ini
+
   # attempt to add additional database types
   for DB_TYPE in $SPECIES_DB_AUTO_EXPAND
   do