diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml index 03902f6e..6096f660 100644 --- a/.github/workflows/pull_requests.yml +++ b/.github/workflows/pull_requests.yml @@ -44,7 +44,7 @@ jobs: run: docker network create libki-net - name: Start database container - run: docker run --name libki-mariadb --network libki-net -e MYSQL_ROOT_PASSWORD=password -e MYSQL_DATABASE=libki --rm -d mariadb:10.3.5 + run: docker run --name libki-mariadb --network libki-net -e MYSQL_ROOT_PASSWORD=password -e MYSQL_DATABASE=libki --rm -d mariadb:lts - name: Sleep to give database container time to launch run: sleep 30 @@ -112,22 +112,16 @@ jobs: run: docker network create libki-net - name: Start database container - run: docker run --name libki-mariadb --network libki-net -e MYSQL_ROOT_PASSWORD=password -e MYSQL_DATABASE=libki --rm -d mariadb:10.3.5 + run: docker run --name libki-mariadb --network libki-net -e MYSQL_ROOT_PASSWORD=password -e MYSQL_DATABASE=libki --rm -d mariadb:lts - name: Sleep to give database container time to launch run: sleep 30 - - name: Load database schema - run: cat installer/schema.sql | docker exec -i libki-mariadb /usr/bin/mysql -u root --password=password libki - - - name: Load database default data - run: cat installer/data.sql | docker exec -i libki-mariadb /usr/bin/mysql -u root --password=password libki - - name: Start Libki container run: docker run --name libki-test-server --network libki-net -e 'LIBKI_INSTANCE=demo' -e 'LIBKI_DB_DSN=dbi:mysql:libki;host=libki-mariadb;port=3306' -e 'LIBKI_DB_USER=root' -e 'LIBKI_DB_PASSWORD=password' -e 'LIBKI_DB_HOST=libki-mariadb' -e 'LIBKI_DB_PORT=3306' -e 'LIBKI_DB_DATABASE=libki' -e 'LIBKI_TZ=America/New_York' -d libki-server - name: Sleep to give Libki container time to launch - run: sleep 30 + run: sleep 60 - name: List docker containers run: docker ps && docker logs libki-test-server diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 16e0c979..d3a09238 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -44,6 +44,7 @@ RUN apk add --no-cache \ perl-html-parser \ perl-http-parser-xs \ perl-io-socket-ssl \ + perl-cpanel-json-xs \ perl-lwp-protocol-https \ perl-module-build \ perl-module-build-tiny \