external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove unsupported postgres versions from devcontainer

pull/7102/head
Nils Dijk 2023-07-05 17:07:40 +00:00
parent 63fa3e1567
commit 214d31fb73
2 changed files with 1 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.devcontainer/.vscode/c_cpp_properties.json vendored
View File

@ -20,36 +20,6 @@
], ],
"configurationProvider": "ms-vscode.makefile-tools" "configurationProvider": "ms-vscode.makefile-tools"
}, },
{
"name": "Citus Development Configuration - Postgres 13.11",
"includePath": [
"/usr/local/include",
"/home/citus/.pgenv/src/postgresql-13.11/src/**",
"${workspaceFolder}/**",
"${workspaceFolder}/src/include/",
],
"configurationProvider": "ms-vscode.makefile-tools"
},
{
"name": "Citus Development Configuration - Postgres 12.15",
"includePath": [
"/usr/local/include",
"/home/citus/.pgenv/src/postgresql-12.15/src/**",
"${workspaceFolder}/**",
"${workspaceFolder}/src/include/",
],
"configurationProvider": "ms-vscode.makefile-tools"
},
{
"name": "Citus Development Configuration - Postgres 16beta2",
"includePath": [
"/usr/local/include",
"/home/citus/.pgenv/src/postgresql-16beta2/src/**",
"${workspaceFolder}/**",
"${workspaceFolder}/src/include/",
],
"configurationProvider": "ms-vscode.makefile-tools"
},
], ],
"version": 4 "version": 4
} }

26
.devcontainer/Dockerfile
View File

@ -51,28 +51,6 @@ ENV PATH="/home/citus/.pgenv/pgsql/bin:${PATH}"
USER citus USER citus
# build postgres versions separately for effective parrallelism and caching of already built versions when changing only certain versions # build postgres versions separately for effective parrallelism and caching of already built versions when changing only certain versions
FROM base AS pg12
RUN pgenv build 12.15
RUN rm .pgenv/src/*.tar*
RUN make -C .pgenv/src/postgresql-*/ clean
# create a staging directory with all files we want to copy from our pgenv build
# we will copy the contents of the staged folder into the final image at once
RUN mkdir .pgenv-staging/
RUN cp -r .pgenv/src .pgenv/pgsql-* .pgenv/config .pgenv-staging/
RUN rm .pgenv-staging/config/default.conf
FROM base AS pg13
RUN pgenv build 13.11
RUN rm .pgenv/src/*.tar*
RUN make -C .pgenv/src/postgresql-*/ clean
# create a staging directory with all files we want to copy from our pgenv build
# we will copy the contents of the staged folder into the final image at once
RUN mkdir .pgenv-staging/
RUN cp -r .pgenv/src .pgenv/pgsql-* .pgenv/config .pgenv-staging/
RUN rm .pgenv-staging/config/default.conf
FROM base AS pg14 FROM base AS pg14
RUN pgenv build 14.8 RUN pgenv build 14.8
RUN rm .pgenv/src/*.tar* RUN rm .pgenv/src/*.tar*
@ -156,11 +134,9 @@ RUN git clone https://github.com/so-fancy/diff-so-fancy.git \
COPY --from=uncrustify-builder /uncrustify/usr/ /usr/ COPY --from=uncrustify-builder /uncrustify/usr/ /usr/
COPY --from=pg12 /home/citus/.pgenv-staging/ /home/citus/.pgenv/
COPY --from=pg13 /home/citus/.pgenv-staging/ /home/citus/.pgenv/
COPY --from=pg14 /home/citus/.pgenv-staging/ /home/citus/.pgenv/ COPY --from=pg14 /home/citus/.pgenv-staging/ /home/citus/.pgenv/
COPY --from=pg15 /home/citus/.pgenv-staging/ /home/citus/.pgenv/ COPY --from=pg15 /home/citus/.pgenv-staging/ /home/citus/.pgenv/
COPY --from=pg16 /home/citus/.pgenv-staging/ /home/citus/.pgenv/ # COPY --from=pg16 /home/citus/.pgenv-staging/ /home/citus/.pgenv/
# place to run your cluster with citus_dev # place to run your cluster with citus_dev
VOLUME /data VOLUME /data