diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 2249b94..0000000 --- a/.dockerignore +++ /dev/null @@ -1,3 +0,0 @@ -* -!src/* -!*.Dockerfile \ No newline at end of file diff --git a/render.py b/render.py index 3dbbbb5..adcc164 100644 --- a/render.py +++ b/render.py @@ -14,7 +14,7 @@ def render(postgres_version, alpine_version): rendered = template.format(alpine_version=alpine_version) - with open(f'{postgres_version}.Dockerfile', 'w') as f: + with open(f'src/{postgres_version}.Dockerfile', 'w') as f: f.write('# This file is generated from template.Dockerfile. Do not edit it directly.\n') f.write('###########################################################################\n\n') f.write(rendered) diff --git a/10.Dockerfile b/src/10.Dockerfile similarity index 84% rename from 10.Dockerfile rename to src/10.Dockerfile index 49b0e27..f719863 100644 --- a/10.Dockerfile +++ b/src/10.Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.8 -ADD src/install.sh install.sh +ADD install.sh install.sh RUN sh install.sh && rm install.sh ENV POSTGRES_DATABASE **None** @@ -22,8 +22,8 @@ ENV S3_S3V4 no ENV SCHEDULE **None** ENV DROP_PUBLIC no -ADD src/run.sh run.sh -ADD src/backup.sh backup.sh -ADD src/restore.sh restore.sh +ADD run.sh run.sh +ADD backup.sh backup.sh +ADD restore.sh restore.sh CMD ["sh", "run.sh"] diff --git a/11.Dockerfile b/src/11.Dockerfile similarity index 84% rename from 11.Dockerfile rename to src/11.Dockerfile index 824f6bc..2c51abc 100644 --- a/11.Dockerfile +++ b/src/11.Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 -ADD src/install.sh install.sh +ADD install.sh install.sh RUN sh install.sh && rm install.sh ENV POSTGRES_DATABASE **None** @@ -22,8 +22,8 @@ ENV S3_S3V4 no ENV SCHEDULE **None** ENV DROP_PUBLIC no -ADD src/run.sh run.sh -ADD src/backup.sh backup.sh -ADD src/restore.sh restore.sh +ADD run.sh run.sh +ADD backup.sh backup.sh +ADD restore.sh restore.sh CMD ["sh", "run.sh"] diff --git a/12.Dockerfile b/src/12.Dockerfile similarity index 84% rename from 12.Dockerfile rename to src/12.Dockerfile index 95ea474..29900eb 100644 --- a/12.Dockerfile +++ b/src/12.Dockerfile @@ -3,7 +3,7 @@ FROM alpine:edge -ADD src/install.sh install.sh +ADD install.sh install.sh RUN sh install.sh && rm install.sh ENV POSTGRES_DATABASE **None** @@ -22,8 +22,8 @@ ENV S3_S3V4 no ENV SCHEDULE **None** ENV DROP_PUBLIC no -ADD src/run.sh run.sh -ADD src/backup.sh backup.sh -ADD src/restore.sh restore.sh +ADD run.sh run.sh +ADD backup.sh backup.sh +ADD restore.sh restore.sh CMD ["sh", "run.sh"] diff --git a/9.Dockerfile b/src/9.Dockerfile similarity index 84% rename from 9.Dockerfile rename to src/9.Dockerfile index 34b7409..4a3ce3c 100644 --- a/9.Dockerfile +++ b/src/9.Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.6 -ADD src/install.sh install.sh +ADD install.sh install.sh RUN sh install.sh && rm install.sh ENV POSTGRES_DATABASE **None** @@ -22,8 +22,8 @@ ENV S3_S3V4 no ENV SCHEDULE **None** ENV DROP_PUBLIC no -ADD src/run.sh run.sh -ADD src/backup.sh backup.sh -ADD src/restore.sh restore.sh +ADD run.sh run.sh +ADD backup.sh backup.sh +ADD restore.sh restore.sh CMD ["sh", "run.sh"] diff --git a/template.Dockerfile b/template.Dockerfile index 55ce6c8..038dc1e 100644 --- a/template.Dockerfile +++ b/template.Dockerfile @@ -1,6 +1,6 @@ FROM alpine:{alpine_version} -ADD src/install.sh install.sh +ADD install.sh install.sh RUN sh install.sh && rm install.sh ENV POSTGRES_DATABASE **None** @@ -19,8 +19,8 @@ ENV S3_S3V4 no ENV SCHEDULE **None** ENV DROP_PUBLIC no -ADD src/run.sh run.sh -ADD src/backup.sh backup.sh -ADD src/restore.sh restore.sh +ADD run.sh run.sh +ADD backup.sh backup.sh +ADD restore.sh restore.sh CMD ["sh", "run.sh"]