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

update devcontainer spec

pull/7102/head
Nils Dijk 2021-12-23 12:54:00 +01:00
parent 5d0da20fa8
commit cc33cbcb44
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.devcontainer/Dockerfile
View File

@ -59,19 +59,19 @@ 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 FROM base AS pg12
RUN pgenv build 12.8 RUN pgenv build 12.9
RUN rm .pgenv/src/*.tar* RUN rm .pgenv/src/*.tar*
# TODO remove excessive artifacts for smaller images # TODO remove excessive artifacts for smaller images
RUN make -C .pgenv/src/postgresql-*/ clean RUN make -C .pgenv/src/postgresql-*/ clean
FROM base AS pg13 FROM base AS pg13
RUN pgenv build 13.4 RUN pgenv build 13.5
RUN rm .pgenv/src/*.tar* RUN rm .pgenv/src/*.tar*
# TODO remove excessive artifacts for smaller images # TODO remove excessive artifacts for smaller images
RUN make -C .pgenv/src/postgresql-*/ clean RUN make -C .pgenv/src/postgresql-*/ clean
FROM base AS pg14 FROM base AS pg14
RUN pgenv build 14beta3 RUN pgenv build 14.1
RUN rm .pgenv/src/*.tar* RUN rm .pgenv/src/*.tar*
# TODO remove excessive artifacts for smaller images # TODO remove excessive artifacts for smaller images
RUN make -C .pgenv/src/postgresql-*/ clean RUN make -C .pgenv/src/postgresql-*/ clean
@ -79,13 +79,13 @@ RUN make -C .pgenv/src/postgresql-*/ clean
# assemble the final container by copying over the artifacts from separately build containers # assemble the final container by copying over the artifacts from separately build containers
FROM base AS devcontainer FROM base AS devcontainer
COPY --from=pg12 /home/citus/.pgenv/src /home/citus/.pgenv/src COPY --from=pg12 /home/citus/.pgenv/src /home/citus/.pgenv/src
COPY --from=pg12 /home/citus/.pgenv/pgsql-12.8 /home/citus/.pgenv/pgsql-12.8 COPY --from=pg12 /home/citus/.pgenv/pgsql-12.9 /home/citus/.pgenv/pgsql-12.9
COPY --from=pg13 /home/citus/.pgenv/src /home/citus/.pgenv/src COPY --from=pg13 /home/citus/.pgenv/src /home/citus/.pgenv/src
COPY --from=pg13 /home/citus/.pgenv/pgsql-13.4 /home/citus/.pgenv/pgsql-13.4 COPY --from=pg13 /home/citus/.pgenv/pgsql-13.5 /home/citus/.pgenv/pgsql-13.5
COPY --from=pg14 /home/citus/.pgenv/src /home/citus/.pgenv/src COPY --from=pg14 /home/citus/.pgenv/src /home/citus/.pgenv/src
COPY --from=pg14 /home/citus/.pgenv/pgsql-14beta3 /home/citus/.pgenv/pgsql-14beta3 COPY --from=pg14 /home/citus/.pgenv/pgsql-14.1 /home/citus/.pgenv/pgsql-14.1
# add some common tools to the final container # add some common tools to the final container
# bin directory for user tools # bin directory for user tools
@ -110,4 +110,4 @@ RUN sudo chown citus:citus /data
COPY --chown=citus:citus .psqlrc . COPY --chown=citus:citus .psqlrc .
# sets default pg version # sets default pg version
RUN pgenv switch 13.4 RUN pgenv switch 14.1

6
.devcontainer/devcontainer.json
View File

@ -1,6 +1,10 @@
{ {
"image": "citus/devcontainer:dev-1", "image": "citus/devcontainer:dev-1",
"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], "runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
"seccomp=unconfined",
],
"forwardPorts": [9700], "forwardPorts": [9700],
"extensions": [ "extensions": [
"ms-vscode.cpptools", "ms-vscode.cpptools",