From 52dd6c378e52eaec31668e4fa48fa09d9510aeae Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 24 Sep 2021 16:46:10 +0300 Subject: [PATCH] Downgrades postgres 13 and 12 image versions since latest versions are debian 11 --- .github/workflows/publish_docker_images_cron.yml | 2 +- .github/workflows/publish_docker_images_on_manual.yml | 2 +- .github/workflows/update_version.yml | 2 +- Dockerfile | 2 +- nightly/Dockerfile | 10 ++++++---- postgres-12/Dockerfile | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish_docker_images_cron.yml b/.github/workflows/publish_docker_images_cron.yml index 33ba310..56d6fb5 100644 --- a/.github/workflows/publish_docker_images_cron.yml +++ b/.github/workflows/publish_docker_images_cron.yml @@ -30,7 +30,7 @@ jobs: run: git clone -b v0.8.4 --depth=1 https://github.com/citusdata/tools.git tools - name: Install package dependencies - run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev + run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources - name: Install python requirements run: python -m pip install -r tools/packaging_automation/requirements.txt diff --git a/.github/workflows/publish_docker_images_on_manual.yml b/.github/workflows/publish_docker_images_on_manual.yml index a26c54c..33b83c4 100644 --- a/.github/workflows/publish_docker_images_on_manual.yml +++ b/.github/workflows/publish_docker_images_on_manual.yml @@ -29,7 +29,7 @@ jobs: run: git clone -b v0.8.4 --depth=1 https://github.com/citusdata/tools.git tools - name: Install package dependencies - run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev + run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources - name: Install python requirements run: python -m pip install -r tools/packaging_automation/requirements.txt diff --git a/.github/workflows/update_version.yml b/.github/workflows/update_version.yml index 8e6bb3c..836e7c9 100644 --- a/.github/workflows/update_version.yml +++ b/.github/workflows/update_version.yml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@v2 - name: Install package dependencies - run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev + run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev python3-testresources - name: Clone tools branch run: git clone -b v0.8.4 --depth=1 https://github.com/citusdata/tools.git tools diff --git a/Dockerfile b/Dockerfile index 91355c0..c9d0af8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # This file is auto generated from it's template, # see citusdata/tools/packaging_automation/templates/docker/latest/latest.tmpl.dockerfile. -FROM postgres:13.4 +FROM postgres:13.3 ARG VERSION=10.2.0 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \ diff --git a/nightly/Dockerfile b/nightly/Dockerfile index 47cce8e..7e209bc 100644 --- a/nightly/Dockerfile +++ b/nightly/Dockerfile @@ -8,14 +8,16 @@ LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.version="Nightly" \ org.label-schema.schema-version="1.0" -# switch to Citus nightly +# Perform pre requisites for Citus Nightly Installation RUN apt-key del 1530DF18 \ && rm -rf /etc/apt/sources.list.d/citusdata_community.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \ - curl \ - && curl -s https://install.citusdata.com/community-nightlies/deb.sh | bash \ + curl + +# Install Citus nightly +RUN curl -s https://install.citusdata.com/community-nightlies/deb.sh | bash \ && apt-get install -y postgresql-$PG_MAJOR-citus \ && apt-get purge -y --auto-remove curl \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/postgres-12/Dockerfile b/postgres-12/Dockerfile index 1c7ca70..33f2a1f 100644 --- a/postgres-12/Dockerfile +++ b/postgres-12/Dockerfile @@ -1,6 +1,6 @@ # This file is auto generated from it's template, # see citusdata/tools/packaging_automation/templates/docker/postgres-12/postgres-12.tmpl.dockerfile. -FROM postgres:12.8 +FROM postgres:12.7 ARG VERSION=10.2.0 LABEL maintainer="Citus Data https://citusdata.com" \ org.label-schema.name="Citus" \