Skip to content

Commit

Permalink
add tap, upstream pgenv, valgrind, openssl, lz4
Browse files Browse the repository at this point in the history
  • Loading branch information
thanodnl committed Aug 18, 2023
1 parent e2652d9 commit 2dc647e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
12 changes: 9 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# install build tools
RUN apt update && apt install -y \
bzip2 \
cpanminus \
curl \
flex \
gcc \
Expand All @@ -15,7 +16,6 @@ RUN apt update && apt install -y \
libicu-dev \
libkrb5-dev \
liblz4-dev \
liblz4-dev \
libpam0g-dev \
libreadline-dev \
libreadline-dev \
Expand All @@ -25,14 +25,18 @@ RUN apt update && apt install -y \
libzstd-dev \
locales \
make \
perl \
pkg-config \
python3 \
python3-pip \
sudo \
uuid-dev \
valgrind \
zlib1g-dev \
&& apt clean

RUN cpanm install IPC::Run

RUN locale-gen en_US.UTF-8

# add the citus user to sudoers and allow all sudoers to login without a password prompt
Expand All @@ -43,7 +47,7 @@ RUN useradd -ms /bin/bash citus \
WORKDIR /home/citus
USER citus

RUN git clone --branch feature/switch https://github.com/thanodnl/pgenv.git .pgenv
RUN git clone https://github.com/theory/pgenv.git .pgenv
COPY --chown=citus:citus pgenv/config/ .pgenv/config/
ENV PATH="/home/citus/.pgenv/bin:${PATH}"
ENV PATH="/home/citus/.pgenv/pgsql/bin:${PATH}"
Expand Down Expand Up @@ -128,6 +132,8 @@ RUN sudo apt update \
fswatch \
gdb \
htop \
libdbd-pg-perl \
libdbi-perl \
lsof \
man \
net-tools \
Expand Down Expand Up @@ -172,7 +178,7 @@ COPY --chown=citus:citus .psqlrc .
RUN sudo chown --from=root:root citus:citus -R ~

# sets default pg version
RUN pgenv switch latest 16
RUN pgenv switch 16beta3

# make connecting to the coordinator easy
ENV PGPORT=9700
6 changes: 4 additions & 2 deletions .devcontainer/pgenv/config/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ PGENV_CONFIGURE_OPTIONS=(
--enable-debug
--enable-depend
--enable-cassert
'CFLAGS=-ggdb -Og -g3 -fno-omit-frame-pointer'
--enable-tap-tests
'CFLAGS=-ggdb -Og -g3 -fno-omit-frame-pointer -DUSE_VALGRIND'
--with-openssl
--with-libxml
--with-libxslt
--with-uuid=e2fs
--with-openssl
--with-icu
--with-lz4
)

0 comments on commit 2dc647e

Please sign in to comment.