Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump docker to version 10.2.1 #268

Merged
merged 22 commits into from
Sep 28, 2021
Merged

Bump docker to version 10.2.1 #268

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b621a2d
Changes pg13 as latest image
gurkanindibay Sep 22, 2021
21d3ba8
Removes pg13 and adds pg14 as supported image
gurkanindibay Sep 22, 2021
9e7e0b6
Changes tools docker branch
gurkanindibay Sep 22, 2021
30c55ee
Updates pipeline tools branches as v0.8.4
gurkanindibay Sep 24, 2021
52dd6c3
Downgrades postgres 13 and 12 image versions
gurkanindibay Sep 24, 2021
63f31da
Update postgres-14/Dockerfile
gurkanindibay Sep 24, 2021
8b1423c
Rollbacks postgres 14 version
gurkanindibay Sep 24, 2021
ed5f509
Apply suggestions from code review
gurkanindibay Sep 24, 2021
2ae0ea3
Formats pg14 file
gurkanindibay Sep 24, 2021
e85ce0b
Formats pg14 file
gurkanindibay Sep 24, 2021
0826e03
Adds hll and topn into pg14 image
gurkanindibay Sep 24, 2021
4604212
Adds hll and topn into pg14 image
gurkanindibay Sep 24, 2021
28c5904
Unifies multiple runs into one
gurkanindibay Sep 24, 2021
6a07512
Adds curl
gurkanindibay Sep 24, 2021
5fc94f4
Fixes execution problems
gurkanindibay Sep 24, 2021
21886fd
Apply suggestions from code review
gurkanindibay Sep 24, 2021
429587d
Removes unnecessary empty space
gurkanindibay Sep 27, 2021
c7c05a0
Fixes review notes
gurkanindibay Sep 27, 2021
86882e4
Fixes review notes
gurkanindibay Sep 27, 2021
55000e8
Fixes review notes
gurkanindibay Sep 28, 2021
cb07ece
Bump version into 10.2.1
gurkanindibay Sep 28, 2021
f58901b
Fixes missing docker-compose version change
gurkanindibay Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/publish_docker_images_cron.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ jobs:
- latest
- alpine
- postgres_12
- postgres_13
- postgres_14
- nightly
steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Clone tools branch
run: git clone -b v0.8.3 --depth=1 https://github.com/citusdata/tools.git tools
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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_docker_images_on_manual.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
uses: actions/checkout@v2

- name: Clone tools branch
run: git clone -b v0.8.3 --depth=1 https://github.com/citusdata/tools.git tools
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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_docker_images_on_push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:
- latest
- alpine
- postgres_12
- postgres_13
- postgres_14
- nightly
steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Clone tools branch
run: git clone -b v0.8.3 --depth=1 https://github.com/citusdata/tools.git tools
run: git clone -b v0.8.4 --depth=1 https://github.com/citusdata/tools.git tools
gurkanindibay marked this conversation as resolved.
Show resolved Hide resolved

- name: Install package dependencies
run: sudo apt-get update && sudo apt install libcurl4-openssl-dev libssl-dev
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update_version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ 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.3 --depth=1 https://github.com/citusdata/tools.git tools
run: git clone -b v0.8.4 --depth=1 https://github.com/citusdata/tools.git tools

- name: Set git name and email
run: |
Expand Down
14 changes: 5 additions & 9 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:14beta3
FROM postgres:13.3
ARG VERSION=10.2.0
LABEL maintainer="Citus Data https://citusdata.com" \
org.label-schema.name="Citus" \
Expand All @@ -12,20 +12,16 @@ LABEL maintainer="Citus Data https://citusdata.com" \
org.label-schema.schema-version="1.0"

ENV CITUS_VERSION ${VERSION}.citus-1
#install postgresql
RUN apt-get update && apt-get install -y lsb-release apt-utils wget curl gnupg2 && apt-get clean all \
&& wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
&& sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main 14" > /etc/apt/sources.list.d/pgdg.list' \
&& apt-get purge -y --auto-remove curl \
&& rm -rf /var/lib/apt/lists/*

# install Citus
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
ca-certificates \
curl \
&& curl -s https://install.citusdata.com/community/deb.sh | bash \
&& apt-get install -y postgresql-$PG_MAJOR-citus-10.2=$CITUS_VERSION \
&& curl -s https://install.citusdata.com/community/deb.sh | bash \
&& apt-get install -y postgresql-$PG_MAJOR-citus-10.2=$CITUS_VERSION \
postgresql-$PG_MAJOR-hll=2.15.citus-1 \
postgresql-$PG_MAJOR-topn=2.3.1 \
hanefi marked this conversation as resolved.
Show resolved Hide resolved
&& apt-get purge -y --auto-remove curl \
&& rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion nightly/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LABEL maintainer="Citus Data https://citusdata.com" \
org.label-schema.version="Nightly" \
org.label-schema.schema-version="1.0"

# switch to Citus nightly
# Perform prerequisites for Citus Nightly Installation
RUN apt-key del 1530DF18 \
&& rm -rf /etc/apt/sources.list.d/citusdata_community.list \
&& apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion postgres-12/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" \
Expand Down
28 changes: 19 additions & 9 deletions postgres-13/Dockerfile → postgres-14/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:14beta3
hanefi marked this conversation as resolved.
Show resolved Hide resolved
ARG VERSION=10.2.0
LABEL maintainer="Citus Data https://citusdata.com" \
org.label-schema.name="Citus" \
Expand All @@ -13,17 +13,27 @@ LABEL maintainer="Citus Data https://citusdata.com" \

ENV CITUS_VERSION ${VERSION}.citus-1

# install Citus
RUN apt-get update \
#install postgresql repo and citus
hanefi marked this conversation as resolved.
Show resolved Hide resolved
#install postgresql
hanefi marked this conversation as resolved.
Show resolved Hide resolved
RUN apt-get update \
&& apt-get install -y lsb-release \
apt-utils \
wget \
curl \
gnupg2 \
hanefi marked this conversation as resolved.
Show resolved Hide resolved
&& apt-get clean all \
hanefi marked this conversation as resolved.
Show resolved Hide resolved
&& wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
&& echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main 14" > /etc/apt/sources.list.d/pgdg.list \
&& apt-get install -y --no-install-recommends \
ca-certificates \
curl \
&& curl -s https://install.citusdata.com/community/deb.sh | bash \
&& apt-get install -y postgresql-$PG_MAJOR-citus-10.2=$CITUS_VERSION \
postgresql-$PG_MAJOR-hll=2.15.citus-1 \
postgresql-$PG_MAJOR-topn=2.3.1 \
&& apt-get purge -y --auto-remove curl \
&& rm -rf /var/lib/apt/lists/*
&& curl -s https://install.citusdata.com/community/deb.sh | bash \
hanefi marked this conversation as resolved.
Show resolved Hide resolved
&& apt-get install -y postgresql-$PG_MAJOR-citus-10.2=$CITUS_VERSION \
hanefi marked this conversation as resolved.
Show resolved Hide resolved
postgresql-$PG_MAJOR-hll=2.16.citus-1 \
postgresql-$PG_MAJOR-topn=2.4.0 \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get purge -y --auto-remove curl
hanefi marked this conversation as resolved.
Show resolved Hide resolved

hanefi marked this conversation as resolved.
Show resolved Hide resolved

# add citus to default PostgreSQL config
RUN echo "shared_preload_libraries='citus'" >> /usr/share/postgresql/postgresql.conf.sample
Expand Down