Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump PGBouncer and Alpine version #27

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bump PGBouncer and Alpine version #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
858e758
[ISSUE-15] Not reveal secrets
toloco Jun 26, 2020
abe5cb5
Bump PGBouncer and Alpine version
toloco Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
FROM alpine:3.11.2 AS build_stage
FROM alpine:3.12 AS build_stage

ARG PGBOUNCER_VERSION=1.12.0
WORKDIR /
RUN apk --update add python py-pip build-base automake libtool m4 autoconf libevent-dev openssl-dev c-ares-dev
RUN pip install docutils \
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've just removed some python stuff that was not necessary

&& wget https://github.com/pgbouncer/pgbouncer/releases/download/pgbouncer_1_12_0/pgbouncer-1.12.0.tar.gz \
&& tar zxf pgbouncer-1.12.0.tar.gz && rm pgbouncer-1.12.0.tar.gz \
&& cd /pgbouncer-1.12.0/ \
RUN apk --update add build-base automake libtool m4 autoconf libevent-dev openssl-dev c-ares-dev
RUN wget https://github.com/pgbouncer/pgbouncer/releases/download/pgbouncer_1_14_0/pgbouncer-1.14.0.tar.gz \
&& tar zxf pgbouncer-1.14.0.tar.gz && rm pgbouncer-1.14.0.tar.gz \
&& cd /pgbouncer-1.14.0/ \
&& ./configure --prefix=/pgbouncer \
&& make \
&& make install


WORKDIR /bin
RUN ln -s ../usr/bin/rst2man.py rst2man

FROM alpine:3.11.2
FROM alpine:3.12
RUN apk --update add libevent openssl c-ares
WORKDIR /
COPY --from=build_stage /pgbouncer /pgbouncer
Expand Down
2 changes: 1 addition & 1 deletion entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ chmod -R 755 ${PG_LOG}
chown -R ${PG_USER}:${PG_USER} ${PG_LOG}

if [ -z $QUIET ]; then
cat ${PG_CONFIG_DIR}/pgbouncer.ini
cat ${PG_CONFIG_DIR}/pgbouncer.ini | sed "s/${DB_PASSWORD}/*****/g"
fi
echo "Starting pgbouncer..."
exec /pgbouncer/bin/pgbouncer ${QUIET:+-q} -u ${PG_USER} ${PG_CONFIG_DIR}/pgbouncer.ini