diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6dca34e3..bcfd934c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,5 @@ --- -services: - - mysql:latest - variables: - MYSQL_DATABASE: re2o - MYSQL_ROOT_PASSWORD: re2o LANG: 'en_US.UTF-8' LC_ALL: 'en_US.UTF-8' LANGUAGE: 'en_US.UTF-8' diff --git a/install_re2o.sh b/install_re2o.sh index e53465ca..28574539 100755 --- a/install_re2o.sh +++ b/install_re2o.sh @@ -839,7 +839,7 @@ main_function() { ci-setup ) install_requirements - install_db 2 1 re2o re2o re2o + install_database 2 1 re2o re2o re2o install_ldap 1 re2o "dc=example,dc=net" write_settings_file 2 localhost re2o re2o re2o \ "cn=admin,dc=example,dc=net" 2 re2o localhost "dc=example,dc=net" \