From 5b8720c0d736a74e138ab2c1562a0464689c8480 Mon Sep 17 00:00:00 2001 From: Jonathan Azoff Date: Thu, 2 Nov 2017 14:03:19 -0700 Subject: [PATCH 1/5] install git-lfs and dockerize --- 9.6/Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/9.6/Dockerfile b/9.6/Dockerfile index 6f94be40b9..3bbf49a78b 100644 --- a/9.6/Dockerfile +++ b/9.6/Dockerfile @@ -1,10 +1,13 @@ # vim:set ft=dockerfile: FROM debian:jessie +RUN RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash + RUN set -ex; \ if ! command -v gpg > /dev/null; then \ apt-get update; \ apt-get install -y --no-install-recommends \ + git-lfs \ gnupg \ dirmngr \ ; \ @@ -14,6 +17,12 @@ RUN set -ex; \ # explicitly set user/group IDs RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres +# install dockerize +ENV DOCKERIZE_VERSION v0.5.0 +RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ + && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ + && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz + # grab gosu for easy step-down from root ENV GOSU_VERSION 1.10 RUN set -x \ From 287c2b2e70a3d1daa7cf0506e8ee8222e7c97c40 Mon Sep 17 00:00:00 2001 From: Jonathan Azoff Date: Wed, 9 May 2018 18:44:25 -0700 Subject: [PATCH 2/5] adds jq1.5 --- 9.6/Dockerfile | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/9.6/Dockerfile b/9.6/Dockerfile index 3bbf49a78b..981efe9e93 100644 --- a/9.6/Dockerfile +++ b/9.6/Dockerfile @@ -1,13 +1,11 @@ # vim:set ft=dockerfile: FROM debian:jessie -RUN RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash - RUN set -ex; \ if ! command -v gpg > /dev/null; then \ apt-get update; \ apt-get install -y --no-install-recommends \ - git-lfs \ + curl \ gnupg \ dirmngr \ ; \ @@ -17,12 +15,6 @@ RUN set -ex; \ # explicitly set user/group IDs RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres -# install dockerize -ENV DOCKERIZE_VERSION v0.5.0 -RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ - && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ - && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz - # grab gosu for easy step-down from root ENV GOSU_VERSION 1.10 RUN set -x \ @@ -37,6 +29,23 @@ RUN set -x \ && gosu nobody true \ && apt-get purge -y --auto-remove ca-certificates wget +# install git-lfs +RUN set -x \ + && apt-get update && apt-get install -y --no-install-recommends ca-certificates curl ssh wget \ + && curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash \ + && apt-get install -y --no-install-recommends git-lfs \ + && rm -rf /var/lib/apt/lists/* + +# install jq 1.5 +RUN sudo curl -Lo /usr/local/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ + && sudo chmod +x /usr/local/bin/jq + +# install dockerize +ENV DOCKERIZE_VERSION v0.5.0 +RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ + && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ + && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz + # make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \ && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 From 85b4362dce8d84e5e5c15b348785a5a38df16b8f Mon Sep 17 00:00:00 2001 From: Jonathan Azoff Date: Wed, 9 May 2018 18:45:09 -0700 Subject: [PATCH 3/5] update dockerfile --- 9.6/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/9.6/Dockerfile b/9.6/Dockerfile index 981efe9e93..86d06ac2ec 100644 --- a/9.6/Dockerfile +++ b/9.6/Dockerfile @@ -37,8 +37,8 @@ RUN set -x \ && rm -rf /var/lib/apt/lists/* # install jq 1.5 -RUN sudo curl -Lo /usr/local/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ - && sudo chmod +x /usr/local/bin/jq +RUN curl -Lo /usr/local/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ + && chmod +x /usr/local/bin/jq # install dockerize ENV DOCKERIZE_VERSION v0.5.0 From 8c54819d2e2f6dadec14b4274d3cf90a017c00ff Mon Sep 17 00:00:00 2001 From: Jonathan Azoff Date: Wed, 9 May 2018 19:14:44 -0700 Subject: [PATCH 4/5] use omni version --- 9.6/omni/Dockerfile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 9.6/omni/Dockerfile diff --git a/9.6/omni/Dockerfile b/9.6/omni/Dockerfile new file mode 100644 index 0000000000..9938f0eb9a --- /dev/null +++ b/9.6/omni/Dockerfile @@ -0,0 +1,18 @@ +FROM postgres:9.6 + +# install git-lfs +RUN set -x \ + && apt-get update && apt-get install -y --no-install-recommends ca-certificates curl ssh wget \ + && curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash \ + && apt-get install -y --no-install-recommends git-lfs \ + && rm -rf /var/lib/apt/lists/* + +# install jq 1.5 +RUN curl -Lo /usr/local/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ + && chmod +x /usr/local/bin/jq + +# install dockerize +ENV DOCKERIZE_VERSION v0.5.0 +RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ + && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ + && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ No newline at end of file From 7bc9c0dde471680037c847c58368ae0527245e45 Mon Sep 17 00:00:00 2001 From: Jonathan Azoff Date: Fri, 24 Aug 2018 10:57:53 -0700 Subject: [PATCH 5/5] Upgrade to 9.6.10 and install plperl --- 9.6/{omni => omni-9.6.10}/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename 9.6/{omni => omni-9.6.10}/Dockerfile (87%) diff --git a/9.6/omni/Dockerfile b/9.6/omni-9.6.10/Dockerfile similarity index 87% rename from 9.6/omni/Dockerfile rename to 9.6/omni-9.6.10/Dockerfile index 9938f0eb9a..e3f1815212 100644 --- a/9.6/omni/Dockerfile +++ b/9.6/omni-9.6.10/Dockerfile @@ -1,10 +1,10 @@ -FROM postgres:9.6 +FROM postgres:9.6.10 # install git-lfs RUN set -x \ && apt-get update && apt-get install -y --no-install-recommends ca-certificates curl ssh wget \ && curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash \ - && apt-get install -y --no-install-recommends git-lfs \ + && apt-get install -y --no-install-recommends git-lfs postgresql-plperl-9.6 \ && rm -rf /var/lib/apt/lists/* # install jq 1.5