From c0f42c37b56ada05af8e148ceac8d8153de8091c Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Mon, 5 Nov 2018 18:46:39 +0800 Subject: [PATCH 1/4] feat(postgres): use docker's official postgres:11 image --- .travis.yml | 2 +- Dockerfile | 75 +++++-------------- .../003_restore_from_backup.sh | 8 +- rootfs/patcher-script.d/patch_wal_e_s3.py | 12 +++ rootfs/patcher-script.py | 32 ++++++++ 5 files changed, 71 insertions(+), 58 deletions(-) create mode 100644 rootfs/patcher-script.d/patch_wal_e_s3.py create mode 100644 rootfs/patcher-script.py diff --git a/.travis.yml b/.travis.yml index ce3dde9..bdc95e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: required language: go services: - docker -script: make test +script: make docker-build && make test notifications: slack: secure: pWDCV3od8gxvzxh9DrOTvBL54XoCfWYhZZlwd2ZbyyOz6SS12Psg/ZuCT2253p4yMfF/LPlsz76mr7NgcCrMI0ReveTa/rnt3XBZtyY+1rlsQsy2oxgdAzbO587ENCQeMw2F/OWHaixMT8NDqxEqQd6xafK9Zmg6BeBjwgs7XfXKcR3WzNIuCO0ZG05+Yd0FIxmd/8Xm5tGiFEYr05+Ix6MLdF9MSCXZUPeu1EsYXhDljokLq49w63W1UMU10tm4t7VCEdaO+X9w6EJ5Ov8HDxb6L6IviUYY6+IGTZ01nwIoM6OrGQqfEAytYqgTKdehgQzQnAbLI6TW2wJ0twqEsLrlbTa4NW4j0KkazQJkN5kqcKYQvaeKJJhvJIG44Gi/u78pW3S6W7NU5DhrlE6bbxdIBHJW1vJBimkqu2oBNrO5ZoBB9MS9zflBsU5g/pQpVeHWMnWE8fcYDGa1PqAcr7q6wtdPsrVZhnHmmARN3PwZzIVVVsXbaIQG8VLC5grLGnwMf1Y1fz2nK3sVpCftvrYZT3G6CNAASo+eLOwYdZdiJ9jIS7WNLN1GtpIEvjeDt3QRqsDyH8YoAKUvY5h/v8IWPP/BaSwQbJwep4+Dj7xkpXX5/4wm4jEnVFV1p4xE0lD1AXvEMAVHtPhhggvscNhF9j6oeoPju6eTPcxG+5o= diff --git a/Dockerfile b/Dockerfile index de2d084..48e637e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,79 +1,42 @@ -FROM quay.io/deis/base:v0.3.6 +FROM postgres:11 -ENV LANG=en_US.utf8 \ - PG_MAJOR=9.4 \ - PG_VERSION=9.4.17-1.pgdg16.04+1 \ - PGDATA=/var/lib/postgresql/data - -# Set this separately from those above since it depends on one of them -ENV PATH=/usr/lib/postgresql/$PG_MAJOR/bin:$PATH - -# Add postgres user and group -RUN adduser --system \ - --shell /bin/bash \ - --disabled-password \ - --group \ - postgres +ARG DEBIAN_FRONTEND=noninteractive RUN buildDeps='gcc git libffi-dev libssl-dev python3-dev python3-pip python3-wheel' && \ - localedef -i en_US -c -f UTF-8 -A /etc/locale.alias en_US.UTF-8 && \ - export DEBIAN_FRONTEND=noninteractive && \ - apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 && \ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list && \ apt-get update && \ apt-get install -y --no-install-recommends \ $buildDeps \ gosu \ lzop \ - postgresql-$PG_MAJOR=$PG_VERSION \ - postgresql-contrib-$PG_MAJOR=$PG_VERSION \ + libpq-dev \ pv \ python3 \ - postgresql-common \ util-linux \ # swift package needs pkg_resources and setuptools python3-pkg-resources \ - python3-setuptools && \ + python3-setuptools \ + python3-pip && \ ln -sf /usr/bin/python3 /usr/bin/python && \ - ln -sf /usr/bin/pip3 /usr/bin/pip && \ - mkdir -p /run/postgresql && \ - chown -R postgres /run/postgresql && \ - # setuptools from ubuntu archives is too old for googleapis-common-protos - pip install --upgrade setuptools && \ + ln -sf /usr/bin/pip3 /usr/bin/pip + +# setuptools from ubuntu archives is too old for googleapis-common-protos +RUN pip install --upgrade setuptools && \ pip install --disable-pip-version-check --no-cache-dir \ - envdir==0.7 \ - wal-e[aws,azure,google,swift]==v1.0.2 \ - # pin azure-storage to version wal-e uses (see docker-entrypoint.sh) - azure-storage==0.20.0 && \ - # "upgrade" boto to 2.43.0 + the patch to fix minio connections - pip install --disable-pip-version-check --no-cache-dir --upgrade git+https://github.com/teamhephy/boto@88c980e56d1053892eb940d43a15a68af4ebb5e6 && \ - # cleanup - apt-get purge -y --auto-remove $buildDeps && \ + envdir==1.0.1 \ + wal-e[aws,azure,google,swift]==1.1.0 \ + gcloud==0.18.3 \ + oauth2client==4.1.3 \ + azure-storage==0.20.0 + +# cleanup +RUN apt-get purge -y --auto-remove $buildDeps && \ apt-get autoremove -y && \ - apt-get clean -y && \ - # package up license files if any by appending to existing tar - COPYRIGHT_TAR='/usr/share/copyrights.tar' && \ - gunzip -f $COPYRIGHT_TAR.gz && \ - tar -rf $COPYRIGHT_TAR /usr/share/doc/*/copyright && \ - gzip $COPYRIGHT_TAR && \ - rm -rf \ - /usr/share/doc \ - /usr/share/man \ - /usr/share/info \ - /usr/share/locale \ - /var/lib/apt/lists/* \ - /var/log/* \ - /var/cache/debconf/* \ - /etc/systemd \ - /lib/lsb \ - /lib/udev \ - /usr/lib/x86_64-linux-gnu/gconv/IBM* \ - /usr/lib/x86_64-linux-gnu/gconv/EBC* && \ - bash -c "mkdir -p /usr/share/man/man{1..8}" + apt-get clean -y COPY rootfs / ENV WALE_ENVDIR=/etc/wal-e.d/env RUN mkdir -p $WALE_ENVDIR +RUN python3 /patcher-script.py CMD ["/docker-entrypoint.sh", "postgres"] EXPOSE 5432 diff --git a/rootfs/docker-entrypoint-initdb.d/003_restore_from_backup.sh b/rootfs/docker-entrypoint-initdb.d/003_restore_from_backup.sh index c73776d..5846881 100755 --- a/rootfs/docker-entrypoint-initdb.d/003_restore_from_backup.sh +++ b/rootfs/docker-entrypoint-initdb.d/003_restore_from_backup.sh @@ -20,7 +20,7 @@ gosu postgres pg_ctl -D "$PGDATA" -w restart if [[ $(envdir "$WALE_ENVDIR" wal-e --terse backup-list | wc -l) -gt "1" ]]; then echo "Found backups. Restoring from backup..." gosu postgres pg_ctl -D "$PGDATA" -w stop - rm -rf "$PGDATA" + rm -rf "$PGDATA/*" envdir "$WALE_ENVDIR" wal-e backup-fetch "$PGDATA" LATEST cat << EOF > "$PGDATA/postgresql.conf" # These settings are initialized by initdb, but they can be changed. @@ -53,6 +53,12 @@ EOF gosu postgres pg_ctl -D "$PGDATA" \ -o "-c listen_addresses=''" \ -w start + + echo "Waiting for recovery completion..." + while [ ! -f "$PGDATA/recovery.done" ] + do + sleep 2 + done fi echo "Performing an initial backup..." diff --git a/rootfs/patcher-script.d/patch_wal_e_s3.py b/rootfs/patcher-script.d/patch_wal_e_s3.py new file mode 100644 index 0000000..1cdd429 --- /dev/null +++ b/rootfs/patcher-script.d/patch_wal_e_s3.py @@ -0,0 +1,12 @@ +def patch_wal_e_hmac_auth_v4_handler(): + import os + from boto.auth import HmacAuthV4Handler + _init = HmacAuthV4Handler.__init__ + def wrap_init(self, *args, **kwargs): + _init(self, *args, **kwargs) + self.region_name = os.getenv('AWS_REGION', self.region_name) + HmacAuthV4Handler.__init__ = wrap_init + + +if __name__ == '__main__': + patch_wal_e_hmac_auth_v4_handler() diff --git a/rootfs/patcher-script.py b/rootfs/patcher-script.py new file mode 100644 index 0000000..2f6a7cc --- /dev/null +++ b/rootfs/patcher-script.py @@ -0,0 +1,32 @@ +patch_script = """ + +def run_patch_scripts(patch_script_path): + import os + for patch in os.listdir(patch_script_path): + full_patch_file = os.path.join(patch_script_path, patch) + if full_patch_file.endswith('.py') and os.path.isfile(full_patch_file): + with open(full_patch_file, 'r') as f: + try: + exec(f.read()) + except: + pass +run_patch_scripts('/patcher-script.d') + +""" + + +def main(): + result_list = [] + with open("/usr/local/bin/wal-e", "r") as f: + has_patched = False + for line in f: + if not has_patched and line.startswith('import'): + result_list.append(patch_script) + has_patched = True + result_list.append(line) + with open("/usr/local/bin/wal-e", "w") as f: + for line in result_list: + f.write(line) + +if __name__ == '__main__': + main() From 50d89c312cc533e9a59bcf16ccab16f9f50a8996 Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Sat, 10 Nov 2018 12:55:08 +0800 Subject: [PATCH 2/4] fix(Dockerfile): empty continuation lines will become errors in a future release --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 48e637e..16ba718 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ FROM postgres:11 ARG DEBIAN_FRONTEND=noninteractive +ARG BUILD_DEPS='gcc git libffi-dev libssl-dev python3-dev python3-pip python3-wheel' -RUN buildDeps='gcc git libffi-dev libssl-dev python3-dev python3-pip python3-wheel' && \ - apt-get update && \ +RUN apt-get update && \ apt-get install -y --no-install-recommends \ - $buildDeps \ + $BUILD_DEPS \ gosu \ lzop \ libpq-dev \ @@ -29,7 +29,7 @@ RUN pip install --upgrade setuptools && \ azure-storage==0.20.0 # cleanup -RUN apt-get purge -y --auto-remove $buildDeps && \ +RUN apt-get purge -y --auto-remove $BUILD_DEPS && \ apt-get autoremove -y && \ apt-get clean -y From 6c37b92405f540d69ac16856aa231ad7d529cfe6 Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Mon, 12 Nov 2018 14:48:41 +0000 Subject: [PATCH 3/4] fix(WARNING): MSG: WALE_S3_ENDPOINT defined, ignoring AWS_REGION --- Dockerfile | 3 ++- rootfs/bin/create_bucket | 4 ++-- rootfs/docker-entrypoint-initdb.d/001_setup_envdir.sh | 2 +- .../{patch_wal_e_s3.py => patch_boto_s3.py} | 2 +- rootfs/patcher-script.py | 10 ++++++---- 5 files changed, 12 insertions(+), 9 deletions(-) rename rootfs/patcher-script.d/{patch_wal_e_s3.py => patch_boto_s3.py} (82%) diff --git a/Dockerfile b/Dockerfile index 16ba718..ff83d63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,8 @@ RUN apt-get purge -y --auto-remove $BUILD_DEPS && \ COPY rootfs / ENV WALE_ENVDIR=/etc/wal-e.d/env RUN mkdir -p $WALE_ENVDIR -RUN python3 /patcher-script.py +RUN python3 /patcher-script.py /bin/create_bucket +RUN python3 /patcher-script.py /usr/local/bin/wal-e CMD ["/docker-entrypoint.sh", "postgres"] EXPOSE 5432 diff --git a/rootfs/bin/create_bucket b/rootfs/bin/create_bucket index 2d23f63..21377d9 100755 --- a/rootfs/bin/create_bucket +++ b/rootfs/bin/create_bucket @@ -20,7 +20,7 @@ def bucket_exists(conn, name): return True bucket_name = os.getenv('BUCKET_NAME') -region = os.getenv('AWS_REGION') +region = os.getenv('S3_REGION') if os.getenv('DATABASE_STORAGE') == "s3": conn = boto.s3.connect_to_region(region) @@ -85,6 +85,6 @@ else: port=int(os.getenv('S3_PORT')), calling_format=OrdinaryCallingFormat()) # HACK(bacongobbler): allow boto to connect to minio by changing the region name for s3v4 auth - conn.auth_region_name = os.getenv('AWS_REGION') + conn.auth_region_name = os.getenv('S3_REGION') if not bucket_exists(conn, bucket_name): conn.create_bucket(bucket_name) diff --git a/rootfs/docker-entrypoint-initdb.d/001_setup_envdir.sh b/rootfs/docker-entrypoint-initdb.d/001_setup_envdir.sh index 9c343e1..e2c00af 100755 --- a/rootfs/docker-entrypoint-initdb.d/001_setup_envdir.sh +++ b/rootfs/docker-entrypoint-initdb.d/001_setup_envdir.sh @@ -36,7 +36,7 @@ if [[ "$DATABASE_STORAGE" == "s3" || "$DATABASE_STORAGE" == "minio" ]]; then else echo "1" > AWS_INSTANCE_PROFILE fi - echo $AWS_REGION > AWS_REGION + echo $AWS_REGION > S3_REGION echo $BUCKET_NAME > BUCKET_NAME elif [ "$DATABASE_STORAGE" == "gcs" ]; then GOOGLE_APPLICATION_CREDENTIALS="/var/run/secrets/deis/objectstore/creds/key.json" diff --git a/rootfs/patcher-script.d/patch_wal_e_s3.py b/rootfs/patcher-script.d/patch_boto_s3.py similarity index 82% rename from rootfs/patcher-script.d/patch_wal_e_s3.py rename to rootfs/patcher-script.d/patch_boto_s3.py index 1cdd429..1ac58d3 100644 --- a/rootfs/patcher-script.d/patch_wal_e_s3.py +++ b/rootfs/patcher-script.d/patch_boto_s3.py @@ -4,7 +4,7 @@ def patch_wal_e_hmac_auth_v4_handler(): _init = HmacAuthV4Handler.__init__ def wrap_init(self, *args, **kwargs): _init(self, *args, **kwargs) - self.region_name = os.getenv('AWS_REGION', self.region_name) + self.region_name = os.getenv('S3_REGION', self.region_name) HmacAuthV4Handler.__init__ = wrap_init diff --git a/rootfs/patcher-script.py b/rootfs/patcher-script.py index 2f6a7cc..3e7e178 100644 --- a/rootfs/patcher-script.py +++ b/rootfs/patcher-script.py @@ -1,3 +1,5 @@ +import sys + patch_script = """ def run_patch_scripts(patch_script_path): @@ -15,18 +17,18 @@ def run_patch_scripts(patch_script_path): """ -def main(): +def main(patch_file): result_list = [] - with open("/usr/local/bin/wal-e", "r") as f: + with open(patch_file, "r") as f: has_patched = False for line in f: if not has_patched and line.startswith('import'): result_list.append(patch_script) has_patched = True result_list.append(line) - with open("/usr/local/bin/wal-e", "w") as f: + with open(patch_file, "w") as f: for line in result_list: f.write(line) if __name__ == '__main__': - main() + main(sys.argv[1]) From 247bc5c3217acd0d60ebabd8d9f1004bf72b5bcb Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Mon, 12 Nov 2018 16:53:44 +0000 Subject: [PATCH 4/4] feat(minio): support the latest minio --- Dockerfile | 8 ++++-- rootfs/bin/create_bucket | 6 ++-- rootfs/patcher-script.d/patch_boto_s3.py | 7 ++--- rootfs/patcher-script.d/patch_wal_e_s3.py | 18 ++++++++++++ rootfs/patcher-script.py | 35 ++++++++++++++--------- 5 files changed, 51 insertions(+), 23 deletions(-) create mode 100644 rootfs/patcher-script.d/patch_wal_e_s3.py diff --git a/Dockerfile b/Dockerfile index ff83d63..e99e863 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,8 +36,12 @@ RUN apt-get purge -y --auto-remove $BUILD_DEPS && \ COPY rootfs / ENV WALE_ENVDIR=/etc/wal-e.d/env RUN mkdir -p $WALE_ENVDIR -RUN python3 /patcher-script.py /bin/create_bucket -RUN python3 /patcher-script.py /usr/local/bin/wal-e + +ARG PATCH_CMD="python3 /patcher-script.py" +RUN $PATCH_CMD file /bin/create_bucket /patcher-script.d/patch_boto_s3.py +RUN $PATCH_CMD file /usr/local/bin/wal-e /patcher-script.d/patch_boto_s3.py +RUN $PATCH_CMD module wal_e.worker.worker_util /patcher-script.d/patch_wal_e_s3.py + CMD ["/docker-entrypoint.sh", "postgres"] EXPOSE 5432 diff --git a/rootfs/bin/create_bucket b/rootfs/bin/create_bucket index 21377d9..e9caec9 100755 --- a/rootfs/bin/create_bucket +++ b/rootfs/bin/create_bucket @@ -76,9 +76,11 @@ elif os.getenv('DATABASE_STORAGE') == "swift": conn.put_container(os.getenv('BUCKET_NAME')) else: - botoconfig.add_section('s3') + if not botoconfig.has_section("s3"): + botoconfig.add_section('s3') botoconfig.set('s3', 'use-sigv4', 'True') - botoconfig.add_section('Boto') + if not botoconfig.has_section("Boto"): + botoconfig.add_section('Boto') botoconfig.set('Boto', 'is_secure', 'False') conn = S3Connection( host=os.getenv('S3_HOST'), diff --git a/rootfs/patcher-script.d/patch_boto_s3.py b/rootfs/patcher-script.d/patch_boto_s3.py index 1ac58d3..1ebb176 100644 --- a/rootfs/patcher-script.d/patch_boto_s3.py +++ b/rootfs/patcher-script.d/patch_boto_s3.py @@ -1,4 +1,4 @@ -def patch_wal_e_hmac_auth_v4_handler(): +def patch_boto_s3_hmac_auth_v4_handler(): import os from boto.auth import HmacAuthV4Handler _init = HmacAuthV4Handler.__init__ @@ -6,7 +6,4 @@ def wrap_init(self, *args, **kwargs): _init(self, *args, **kwargs) self.region_name = os.getenv('S3_REGION', self.region_name) HmacAuthV4Handler.__init__ = wrap_init - - -if __name__ == '__main__': - patch_wal_e_hmac_auth_v4_handler() +patch_boto_s3_hmac_auth_v4_handler() diff --git a/rootfs/patcher-script.d/patch_wal_e_s3.py b/rootfs/patcher-script.d/patch_wal_e_s3.py new file mode 100644 index 0000000..1b2d4ea --- /dev/null +++ b/rootfs/patcher-script.d/patch_wal_e_s3.py @@ -0,0 +1,18 @@ +def patch_uri_put_file(): + import os + from wal_e.blobstore import s3 + from wal_e.blobstore.s3 import s3_util + def wrap_uri_put_file(creds, uri, fp, content_type=None, conn=None): + assert fp.tell() == 0 + k = s3_util._uri_to_key(creds, uri, conn=conn) + if content_type is not None: + k.content_type = content_type + if os.getenv('DATABASE_STORAGE') == 's3': + encrypt_key=True + else: + encrypt_key=False + k.set_contents_from_file(fp, encrypt_key=encrypt_key) + return k + s3.uri_put_file = wrap_uri_put_file + s3_util.uri_put_file = wrap_uri_put_file +patch_uri_put_file() diff --git a/rootfs/patcher-script.py b/rootfs/patcher-script.py index 3e7e178..56f149e 100644 --- a/rootfs/patcher-script.py +++ b/rootfs/patcher-script.py @@ -1,34 +1,41 @@ import sys -patch_script = """ +patch_script_tmp = """ def run_patch_scripts(patch_script_path): - import os - for patch in os.listdir(patch_script_path): - full_patch_file = os.path.join(patch_script_path, patch) - if full_patch_file.endswith('.py') and os.path.isfile(full_patch_file): - with open(full_patch_file, 'r') as f: - try: - exec(f.read()) - except: - pass -run_patch_scripts('/patcher-script.d') + with open(patch_script_path, 'r') as f: + try: + exec(f.read()) + except: + pass +run_patch_scripts("%s") """ -def main(patch_file): +def main(patch_file, patch_script_file): result_list = [] + patch_script = patch_script_tmp % patch_script_file with open(patch_file, "r") as f: has_patched = False for line in f: - if not has_patched and line.startswith('import'): + if (line.startswith('import') or line.startswith('from')) \ + and not has_patched: result_list.append(patch_script) has_patched = True result_list.append(line) + if not has_patched: result_list.append(patch_script) with open(patch_file, "w") as f: for line in result_list: f.write(line) if __name__ == '__main__': - main(sys.argv[1]) + patch_type = sys.argv[1] + if patch_type == 'file': + patch_file = sys.argv[2] + elif patch_type == 'module': + module = __import__(sys.argv[2], fromlist=True) + patch_file = module.__file__ + patch_script_file = sys.argv[3] + main(patch_file, patch_script_file) +