Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion IFComp-Dev/docker-app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DOCKER-VERSION 0.3.4
FROM perl:5.34
FROM perl:5.42
MAINTAINER Mark Musante [email protected]

RUN apt-get update && apt-get install -y \
Expand Down
6 changes: 3 additions & 3 deletions IFComp-Dev/docker-app/docker-script/docker_start.sh
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion IFComp/cpanfile
Original file line number Diff line number Diff line change
Expand Up @@ -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';
};