diff --git a/.envrc b/.envrc index c025507..c54b92e 100644 --- a/.envrc +++ b/.envrc @@ -1,6 +1,6 @@ NAME=sqitch TITLE=Sqitch -VERSION=1.4.1 +VERSION=1.5.0 IMAGE=sqitch/sqitch DESCRIPTION="Sensible database change management" VENDOR="The Sqitch Community" diff --git a/Dockerfile b/Dockerfile index 71b82ef..54e55ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && tar -zxf App-Sqitch-v$VERSION.tar.gz --strip-components 1 -C src # Install cpan and build dependencies. -ENV PERL5LIB /work/local/lib/perl5 +ENV PERL5LIB=/work/local/lib/perl5 RUN curl -sL --compressed https://git.io/cpm > cpm && chmod +x cpm \ && ./cpm install -L local --verbose --no-test --show-build-log-on-failure ExtUtils::MakeMaker List::MoreUtils::XS \ && ./cpm install -L local --verbose --no-test --show-build-log-on-failure --with-recommends \ @@ -23,10 +23,8 @@ WORKDIR /work/src RUN perl Build.PL --quiet --install_base /app --etcdir /etc/sqitch \ --config installman1dir= --config installsiteman1dir= --config installman3dir= --config installsiteman3dir= \ - --with sqlite --with postgres --with firebird --with odbc \ + --with sqlite --with postgres --with firebird --with odbc --with mysql \ && ln -s /usr/include/ibase.h /usr/include/firebird/ \ - # XXX Fix for removal of BEGIN block in v1.4.1. - && perl -i -pe 's/BEGIN/use App::Sqitch/g' inc/Module/Build/Sqitch.pm \ && ./Build bundle \ && rm -rf /app/man \ && find /app -name '*.pod' | grep -v sqitch | xargs rm -rf @@ -35,14 +33,14 @@ RUN perl Build.PL --quiet --install_base /app --etcdir /etc/sqitch \ # Copy to the final image without all the build stuff. FROM debian:bookworm-slim AS sqitch -# Install runtime system dependencies and remove unnecesary files. +# Install runtime system dependencies and remove unnecessary files. RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt-get -qq update \ && apt-get -qq --no-install-recommends install less libperl5.36 perl-doc nano ca-certificates \ sqlite3 \ firebird3.0-utils libfbclient2 \ libpq5 postgresql-client \ - mariadb-client-core libmariadb-dev-compat libdbd-mysql-perl \ + mariadb-client-core libmariadb-dev-compat \ && apt-cache pkgnames | grep python | xargs apt-get purge -qq \ && apt-cache pkgnames | grep libmagic | xargs apt-get purge -qq \ && apt-get clean \