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

fix defang and pg version #52

Merged
merged 3 commits into from
Nov 17, 2023
Merged

fix defang and pg version #52

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e33a96
fix busted defang line; bump pgclient version to 15
labkey-willm Nov 17, 2023
ca7f74a
hadolint fix
labkey-willm Nov 17, 2023
429f407
hadolint fix 2
labkey-willm Nov 17, 2023
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
29 changes: 18 additions & 11 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,21 @@ RUN [ -n "${DEBUG}" ] && set -x; \
gettext-base=0.21-4ubuntu4 \
unzip=6.0-26ubuntu3.1 \
; \
[ -n "${DEBUG}" ] && apt-get -yq --no-install-recommends install \
iputils-ping=3:20211215-1 \
less=590-1ubuntu0.22.04.1 \
netcat=1.218-4ubuntu1 \
postgresql-client=14+238 \
sudo=1.9.9-1ubuntu2.4 \
tree=2.0.2-1 \
vim=2:8.2.3995-1ubuntu2.13 \
; \
if [ -n "${DEBUG}" ]; then \
# next 2 lines are to get postgres15 to install on ubuntu 22.04
echo "deb http://apt.postgresql.org/pub/repos/apt $(grep VERSION_CODENAME /etc/os-release | cut -d "=" -f2)-pgdg main" > /etc/apt/sources.list.d/pgdg.list; \
wget -qO- https://www.postgresql.org/media/keys/ACCC4CF8.asc | tee /etc/apt/trusted.gpg.d/pgdg.asc > /dev/null 2>&1; \
apt-get update; \
apt-get -yq --no-install-recommends install \
iputils-ping=3:20211215-1 \
less=590-1ubuntu0.22.04.1 \
netcat=1.218-4ubuntu1 \
postgresql-client-15=15.5-1.pgdg22.04+1 \
sudo=1.9.9-1ubuntu2.4 \
tree=2.0.2-1 \
vim=2:8.2.3995-1ubuntu2.13 \
; \
fi; \
apt-get -yq upgrade; \
[ -z "${DEBUG}" ] && apt-get -yq clean all && rm -rf /var/lib/apt/lists/*; \
\
Expand Down Expand Up @@ -260,8 +266,9 @@ EXPOSE ${LABKEY_PORT}

STOPSIGNAL SIGTERM

# defang
RUN [ -z "${DEBUG}" ] && (find / -xdev -perm /6000 -type f -exec chmod a-s {} \; || true)
RUN if [ -z "${DEBUG}" ]; then \
find / -xdev -perm /6000 -type f -exec chmod a-s {} \; || true; \
fi;

USER labkey

Expand Down