From a9ebe9606eb3d033877ca329a5e846eab7c010ac Mon Sep 17 00:00:00 2001 From: Jonas Winkler Date: Thu, 19 Nov 2020 13:19:45 +0100 Subject: [PATCH] updated the release process. --- .../hub/{docker-compose.yml => docker-compose.postgres.yml} | 2 +- docker/hub/docker-compose.sqlite.yml | 2 +- docker/local/Dockerfile | 4 ---- .../local/{docker-compose.yml => docker-compose.postgres.yml} | 0 scripts/make-release.sh | 1 + 5 files changed, 3 insertions(+), 6 deletions(-) rename docker/hub/{docker-compose.yml => docker-compose.postgres.yml} (95%) rename docker/local/{docker-compose.yml => docker-compose.postgres.yml} (100%) diff --git a/docker/hub/docker-compose.yml b/docker/hub/docker-compose.postgres.yml similarity index 95% rename from docker/hub/docker-compose.yml rename to docker/hub/docker-compose.postgres.yml index 01fb1e946..309a895df 100644 --- a/docker/hub/docker-compose.yml +++ b/docker/hub/docker-compose.postgres.yml @@ -15,7 +15,7 @@ services: POSTGRES_PASSWORD: paperless webserver: - image: jonaswinkler/paperless-ng:0.9 + image: jonaswinkler/paperless-ng:0.9.1 restart: always depends_on: - db diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml index 02f1098f0..35df4e9af 100644 --- a/docker/hub/docker-compose.sqlite.yml +++ b/docker/hub/docker-compose.sqlite.yml @@ -5,7 +5,7 @@ services: restart: always webserver: - image: jonaswinkler/paperless-ng:0.9 + image: jonaswinkler/paperless-ng:0.9.1 restart: always depends_on: - broker diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile index 0411d95ee..30fe85230 100644 --- a/docker/local/Dockerfile +++ b/docker/local/Dockerfile @@ -1,7 +1,3 @@ -############################################################################### -### Back end ### -############################################################################### - FROM python:3.7-slim WORKDIR /usr/src/paperless/ diff --git a/docker/local/docker-compose.yml b/docker/local/docker-compose.postgres.yml similarity index 100% rename from docker/local/docker-compose.yml rename to docker/local/docker-compose.postgres.yml diff --git a/scripts/make-release.sh b/scripts/make-release.sh index b361834db..ef3e5769b 100755 --- a/scripts/make-release.sh +++ b/scripts/make-release.sh @@ -79,6 +79,7 @@ cp "$PAPERLESS_ROOT/docker/docker-compose.env" "$PAPERLESS_DIST_APP" # docker files for pulling from docker hub cp "$PAPERLESS_ROOT/docker/hub/"* "$PAPERLESS_DIST" +cp "$PAPERLESS_ROOT/.env" "$PAPERLESS_DIST" cp "$PAPERLESS_ROOT/docker/docker-compose.env" "$PAPERLESS_DIST" # auxiliary files required for the docker image