From cc33cbcb44c179e7fcf91c1562a4fa5463fb6d67 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Thu, 23 Dec 2021 12:54:00 +0100 Subject: [PATCH] update devcontainer spec --- .devcontainer/Dockerfile | 14 +++++++------- .devcontainer/devcontainer.json | 6 +++++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2fbeae6e8..5ec6d2347 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -59,19 +59,19 @@ USER citus # 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.8 +RUN pgenv build 12.9 RUN rm .pgenv/src/*.tar* # TODO remove excessive artifacts for smaller images RUN make -C .pgenv/src/postgresql-*/ clean FROM base AS pg13 -RUN pgenv build 13.4 +RUN pgenv build 13.5 RUN rm .pgenv/src/*.tar* # TODO remove excessive artifacts for smaller images RUN make -C .pgenv/src/postgresql-*/ clean FROM base AS pg14 -RUN pgenv build 14beta3 +RUN pgenv build 14.1 RUN rm .pgenv/src/*.tar* # TODO remove excessive artifacts for smaller images 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 FROM base AS devcontainer 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/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/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 # bin directory for user tools @@ -110,4 +110,4 @@ RUN sudo chown citus:citus /data COPY --chown=citus:citus .psqlrc . # sets default pg version -RUN pgenv switch 13.4 +RUN pgenv switch 14.1 diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3ca6fb820..436f8f355 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,10 @@ { "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], "extensions": [ "ms-vscode.cpptools",