From 01fa00b17f884ff5c5e918f0d40076bbf4f1d75f Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Mon, 14 Sep 2020 18:32:02 +0200 Subject: [PATCH 1/3] port Dockerfile to debian/buildpack-deps --- Dockerfile | 11 ++++++----- docs/example_deployment/uwsgi.ini | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2c8eb78a8..8925bb711 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,13 +2,14 @@ FROM node COPY package.json . RUN npm install --production -FROM alpine +FROM buildpack-deps ENV PYTHONUNBUFFERED 1 -ENV BUILDPKGS gettext py3-pip py3-wheel -ENV RUNTIMEPKGS uwsgi uwsgi-python python3 py3-psycopg2 py3-pyldap libmagic proj gdal +ENV DEBIAN_FRONTEND=noninteractive +ENV BUILDPKGS gettext python3-pip python3-wheel python3-setuptools +ENV RUNTIMEPKGS uwsgi uwsgi-plugin-python3 python3 python3-psycopg2 python3-ldap libmagic1 gdal-bin -RUN adduser -D -g '' uwsgi +RUN adduser --disabled-login --gecos '' uwsgi RUN mkdir -p /log RUN chown uwsgi /log @@ -18,7 +19,7 @@ RUN mkdir -p /media RUN chown uwsgi /media VOLUME /media -RUN apk update && echo $BUILDPKGS $RUNTIMEPKGS && apk add $BUILDPKGS $RUNTIMEPKGS +RUN apt-get update -q && apt-get install -y $BUILDPKGS $RUNTIMEPKGS COPY castellum/ code/castellum/ COPY setup.py LICENSE code/ diff --git a/docs/example_deployment/uwsgi.ini b/docs/example_deployment/uwsgi.ini index fff3c30d4..5a0a57147 100644 --- a/docs/example_deployment/uwsgi.ini +++ b/docs/example_deployment/uwsgi.ini @@ -12,4 +12,4 @@ static-map=/media=/media static-map=/favicon.ico=/code/castellum/collected_static/images/favicon.ico wsgi-file=castellum/wsgi.py -plugin=python +plugin=python3 -- GitLab From 691addcc5189fff8d59741ee6582d8aa7106aa01 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 7 Jul 2020 17:39:31 +0200 Subject: [PATCH 2/3] optimize docker image size --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8925bb711..dae725df5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,9 @@ RUN mkdir -p /media RUN chown uwsgi /media VOLUME /media -RUN apt-get update -q && apt-get install -y $BUILDPKGS $RUNTIMEPKGS +RUN apt-get update -q && \ + apt-get install --no-install-recommends -y $BUILDPKGS $RUNTIMEPKGS && \ + rm -rf /var/lib/apt/lists/* COPY castellum/ code/castellum/ COPY setup.py LICENSE code/ -- GitLab From 168ea465f885572a0f4d01d24bcfa0df9b628a17 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Wed, 8 Jul 2020 16:33:29 +0200 Subject: [PATCH 3/3] adapt cron container --- Dockerfile | 2 +- docs/example_deployment/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dae725df5..9141150f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM buildpack-deps ENV PYTHONUNBUFFERED 1 ENV DEBIAN_FRONTEND=noninteractive ENV BUILDPKGS gettext python3-pip python3-wheel python3-setuptools -ENV RUNTIMEPKGS uwsgi uwsgi-plugin-python3 python3 python3-psycopg2 python3-ldap libmagic1 gdal-bin +ENV RUNTIMEPKGS uwsgi uwsgi-plugin-python3 python3 python3-psycopg2 python3-ldap libmagic1 gdal-bin busybox-static RUN adduser --disabled-login --gecos '' uwsgi diff --git a/docs/example_deployment/docker-compose.yml b/docs/example_deployment/docker-compose.yml index 517c6ae18..a2357e354 100644 --- a/docs/example_deployment/docker-compose.yml +++ b/docs/example_deployment/docker-compose.yml @@ -60,7 +60,7 @@ services: restart: always environment: DJANGO_SETTINGS_MODULE: castellum.settings.deployment - command: crond -f -L /log/cron.log + command: busybox crond -f -L /log/cron.log volumes: - ./settings.py:/code/castellum/settings/deployment.py:ro - ./crontab:/etc/crontabs/root:ro -- GitLab