Skip to content

Commit

Permalink
Fix deb build shebang
Browse files Browse the repository at this point in the history
  • Loading branch information
usernamedt committed Sep 1, 2023
1 parent 4a73ba0 commit 296ecf3
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ install:
mkdir -p $(DESTDIR)/etc/pgconsul/plugins
# Fix "ValueError: bad marshal data (unknown type code)"
find $(INSTALL_DIR) -name __pycache__ -type d -exec rm -rf {} +

install_local: install
# Make symlinks in /usr/local/bin
ln -s /opt/yandex/pgconsul/bin/pgconsul $(DESTDIR)/usr/local/bin
ln -s /opt/yandex/pgconsul/bin/pgconsul-util $(DESTDIR)/usr/local/bin
Expand Down
2 changes: 1 addition & 1 deletion docker/pgconsul/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN pg_dropcluster --stop $PG_MAJOR main && \
ln -s /usr/lib/postgresql/$PG_MAJOR/bin /usr/bin/postgresql && \
mkdir -p /etc/pgconsul/plugins && \
cd /var/lib/dist && \
DESTDIR=/ make install_local && \
DESTDIR=/ make install && \
cp /var/lib/dist/docker/pgconsul/pgconsul_${replication_type}.conf /etc/pgconsul.conf && \
cp /var/lib/dist/docker/pgconsul/gen_rec_conf.sh /usr/local/bin/gen_rec_conf.sh && \
echo "*:*:*:repl:repl" > /var/lib/postgresql/.pgpass && \
Expand Down
2 changes: 1 addition & 1 deletion tests/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]

RUN mkdir /repo
COPY ./ /repo/
RUN cd /repo && DESTDIR=/ make install_local
RUN cd /repo && DESTDIR=/ make install
RUN ln -s /repo/src/plugins/upload_wals.py /etc/pgconsul/plugins/upload_wals.py
RUN chown -R postgres:postgres /opt/yandex/pgconsul /etc/pgconsul/plugins /repo/src/plugins

Expand Down

0 comments on commit 296ecf3

Please sign in to comment.