-
Notifications
You must be signed in to change notification settings - Fork 101
Bump docker to version 12.1.10 #364
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.
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
Closed
ihalatci
wants to merge
5
commits into
master
from
release-12.1.9-ae1cd527-ac1d-4210-8de3-e4b87dc344ed
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
b4cfb3f
Fix formatting of gh_token argument in workflow
ihalatci 8e07188
permissions clause in workflow yaml
ihalatci ba9337e
Bump docker to version 12.1.9
ihalatci-msft 00a6a97
repurpose the pr for 12.1.10 images
ihalatci eeec71e
typo corrections
ihalatci File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| # This file is auto generated from it's template, | ||
| # see citusdata/tools/packaging_automation/templates/docker/postgres-16/postgres-16.tmpl.dockerfile. | ||
| FROM postgres:14.19-bookworm | ||
| ARG VERSION=12.1.10 | ||
| LABEL maintainer="Citus Data https://citusdata.com" \ | ||
| org.label-schema.name="Citus" \ | ||
| org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \ | ||
| org.label-schema.url="https://www.citusdata.com" \ | ||
| org.label-schema.vcs-url="https://github.com/citusdata/citus" \ | ||
| org.label-schema.vendor="Citus Data, Inc." \ | ||
| org.label-schema.version=${VERSION} \ | ||
| org.label-schema.schema-version="1.0" | ||
|
|
||
| ENV CITUS_VERSION ${VERSION}.citus-1 | ||
|
|
||
| # 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-12.1=$CITUS_VERSION \ | ||
| postgresql-$PG_MAJOR-hll=2.18.citus-1 \ | ||
| postgresql-$PG_MAJOR-topn=2.6.0.citus-1 \ | ||
| && apt-get purge -y --auto-remove curl \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| # add citus to default PostgreSQL config | ||
| RUN echo "shared_preload_libraries='citus'" >> /usr/share/postgresql/postgresql.conf.sample | ||
|
|
||
| # add scripts to run after initdb | ||
| COPY 001-create-citus-extension.sql /docker-entrypoint-initdb.d/ | ||
|
|
||
| # add health check script | ||
| COPY pg_healthcheck wait-for-manager.sh / | ||
| RUN chmod +x /wait-for-manager.sh | ||
|
|
||
| # entry point unsets PGPASSWORD, but we need it to connect to workers | ||
| # https://github.com/docker-library/postgres/blob/33bccfcaddd0679f55ee1028c012d26cd196537d/12/docker-entrypoint.sh#L303 | ||
| RUN sed "/unset PGPASSWORD/d" -i /usr/local/bin/docker-entrypoint.sh | ||
|
|
||
| HEALTHCHECK --interval=4s --start-period=6s CMD ./pg_healthcheck |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| # This file is auto generated from it's template, | ||
| # see citusdata/tools/packaging_automation/templates/docker/postgres-15/postgres-15.tmpl.dockerfile. | ||
| FROM postgres:15.14-bookworm | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. currently -bookworm should stay |
||
| ARG VERSION=13.2.0 | ||
| ARG VERSION=12.1.10 | ||
| LABEL maintainer="Citus Data https://citusdata.com" \ | ||
| org.label-schema.name="Citus" \ | ||
| org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \ | ||
|
|
@@ -19,9 +19,9 @@ RUN apt-get update \ | |
| ca-certificates \ | ||
| curl \ | ||
| && curl -s https://install.citusdata.com/community/deb.sh | bash \ | ||
| && apt-get install -y postgresql-$PG_MAJOR-citus-13.2=$CITUS_VERSION \ | ||
| && apt-get install -y postgresql-$PG_MAJOR-citus-12.1=$CITUS_VERSION \ | ||
| postgresql-$PG_MAJOR-hll=2.18.citus-1 \ | ||
| postgresql-$PG_MAJOR-topn=2.7.0.citus-1 \ | ||
| postgresql-$PG_MAJOR-topn=2.6.0.citus-1 \ | ||
| && apt-get purge -y --auto-remove curl \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
currently -bookworm should stay