add tap, upstream pgenv, valgrind, openssl, lz4

pull/7102/head
Nils Dijk 2023-08-18 15:35:01 +02:00
parent 6683595d02
commit c953700c2c
2 changed files with 13 additions and 5 deletions

View File

@ -7,6 +7,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# install build tools # install build tools
RUN apt update && apt install -y \ RUN apt update && apt install -y \
bzip2 \ bzip2 \
cpanminus \
curl \ curl \
flex \ flex \
gcc \ gcc \
@ -15,7 +16,6 @@ RUN apt update && apt install -y \
libicu-dev \ libicu-dev \
libkrb5-dev \ libkrb5-dev \
liblz4-dev \ liblz4-dev \
liblz4-dev \
libpam0g-dev \ libpam0g-dev \
libreadline-dev \ libreadline-dev \
libreadline-dev \ libreadline-dev \
@ -25,14 +25,18 @@ RUN apt update && apt install -y \
libzstd-dev \ libzstd-dev \
locales \ locales \
make \ make \
perl \
pkg-config \ pkg-config \
python3 \ python3 \
python3-pip \ python3-pip \
sudo \ sudo \
uuid-dev \ uuid-dev \
valgrind \
zlib1g-dev \ zlib1g-dev \
&& apt clean && apt clean
RUN cpanm install IPC::Run
RUN locale-gen en_US.UTF-8 RUN locale-gen en_US.UTF-8
# add the citus user to sudoers and allow all sudoers to login without a password prompt # add the citus user to sudoers and allow all sudoers to login without a password prompt
@ -43,7 +47,7 @@ RUN useradd -ms /bin/bash citus \
WORKDIR /home/citus WORKDIR /home/citus
USER 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/ COPY --chown=citus:citus pgenv/config/ .pgenv/config/
ENV PATH="/home/citus/.pgenv/bin:${PATH}" ENV PATH="/home/citus/.pgenv/bin:${PATH}"
ENV PATH="/home/citus/.pgenv/pgsql/bin:${PATH}" ENV PATH="/home/citus/.pgenv/pgsql/bin:${PATH}"
@ -128,6 +132,8 @@ RUN sudo apt update \
fswatch \ fswatch \
gdb \ gdb \
htop \ htop \
libdbd-pg-perl \
libdbi-perl \
lsof \ lsof \
man \ man \
net-tools \ net-tools \
@ -172,7 +178,7 @@ COPY --chown=citus:citus .psqlrc .
RUN sudo chown --from=root:root citus:citus -R ~ RUN sudo chown --from=root:root citus:citus -R ~
# sets default pg version # sets default pg version
RUN pgenv switch latest 16 RUN pgenv switch 16beta3
# make connecting to the coordinator easy # make connecting to the coordinator easy
ENV PGPORT=9700 ENV PGPORT=9700

View File

@ -4,10 +4,12 @@ PGENV_CONFIGURE_OPTIONS=(
--enable-debug --enable-debug
--enable-depend --enable-depend
--enable-cassert --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-libxml
--with-libxslt --with-libxslt
--with-uuid=e2fs --with-uuid=e2fs
--with-openssl
--with-icu --with-icu
--with-lz4
) )