diff --git a/IFComp-Dev/docker-app/Dockerfile b/IFComp-Dev/docker-app/Dockerfile index d3dcf717..75a01b80 100644 --- a/IFComp-Dev/docker-app/Dockerfile +++ b/IFComp-Dev/docker-app/Dockerfile @@ -1,5 +1,5 @@ # DOCKER-VERSION 0.3.4 -FROM perl:5.34 +FROM perl:5.42 MAINTAINER Mark Musante mark.musante@gmail.com RUN apt-get update && apt-get install -y \ diff --git a/IFComp-Dev/docker-app/docker-script/docker_start.sh b/IFComp-Dev/docker-app/docker-script/docker_start.sh index 0ca63684..56c9caf4 100755 --- a/IFComp-Dev/docker-app/docker-script/docker_start.sh +++ b/IFComp-Dev/docker-app/docker-script/docker_start.sh @@ -1,15 +1,15 @@ #!/bin/sh echo "Waiting for mysql" 1>&2 -mysql -h db < /dev/null +mysql --skip-ssl -h db < /dev/null while [ $? != 0 ] do sleep 1 - mysql -h db < /dev/null + mysql --skip-ssl -h db < /dev/null done echo "Checking that the db exists" -mysql -h db -e "use ifcomp; select count(*) from user;" > /dev/null 2>&1 +mysql --skip-ssl -h db -e "use ifcomp; select count(*) from user;" > /dev/null 2>&1 if [ $? != 0 ] then echo "Deploying database" diff --git a/IFComp/cpanfile b/IFComp/cpanfile index 1d2d22f3..b3dbec4c 100644 --- a/IFComp/cpanfile +++ b/IFComp/cpanfile @@ -59,7 +59,7 @@ on 'develop' => sub { requires 'Code::TidyAll' => '== 0.78'; requires 'DBIx::Class::Schema::Loader'; requires 'Perl::Tidy' => '== 20200822'; - requires 'DBD::mysql', '==4.050'; + requires 'DBD::mysql', '==4.054'; requires 'Catalyst::Devel'; requires 'Module::Install::CPANfile'; };