From fbc8d6415c17a0a9d6fd8fafaee92b6e072fe034 Mon Sep 17 00:00:00 2001 From: Matthew Baggett Date: Sun, 27 Jun 2021 00:20:40 +0200 Subject: [PATCH] Fettling. --- mariadb/Dockerfile | 2 +- octoprint/Dockerfile | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile index 1b2c3a9..b8fbfa2 100644 --- a/mariadb/Dockerfile +++ b/mariadb/Dockerfile @@ -1,4 +1,4 @@ -FROM mariadb:10.6 +FROM mariadb:latest LABEL maintainer="Matthew Baggett " \ org.label-schema.vcs-url="https://github.com/benzine-framework/docker" \ org.opencontainers.image.source="https://github.com/benzine-framework/docker" diff --git a/octoprint/Dockerfile b/octoprint/Dockerfile index e104a74..689208a 100644 --- a/octoprint/Dockerfile +++ b/octoprint/Dockerfile @@ -6,10 +6,13 @@ LABEL maintainer="Matthew Baggett " \ RUN apt-get update -q && \ apt-get install --no-install-recommends -yq \ cpulimit \ - && \ + python-dev libpq-dev \ + postgresql-client \ + && \ apt-get autoremove -y && \ apt-get clean && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/dpkg/status.old /var/cache/debconf/templates.dat /var/log/dpkg.log /var/log/lastlog /var/log/apt/*.log + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/dpkg/status.old /var/cache/debconf/templates.dat /var/log/dpkg.log /var/log/lastlog /var/log/apt/*.log && \ + pip install psycopg2 FROM matthewbaggett/octoprint AS builder RUN apt-get update -q && \