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

Security updates for master release branch #4

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

Security updates for master release branch #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1be53f5
Added pjohnson changes to fix security issues
jamescatto Sep 27, 2022
c26d73e
Simplified apt update
jamescatto Sep 27, 2022
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
8 changes: 5 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14.17 as frontend-builder
FROM node:14.17-bullseye as frontend-builder

RUN npm install --global --force [email protected]

Expand All @@ -25,7 +25,7 @@ COPY --chown=redash client /frontend/client
COPY --chown=redash webpack.config.js /frontend/
RUN if [ "x$skip_frontend_build" = "x" ] ; then yarn build; else mkdir -p /frontend/client/dist && touch /frontend/client/dist/multi_org.html && touch /frontend/client/dist/index.html; fi

FROM python:3.7-slim-buster
FROM python:3.7.13-slim-bullseye

EXPOSE 5000

Expand All @@ -36,8 +36,9 @@ ARG skip_dev_deps

RUN useradd --create-home redash


# Ubuntu packages
RUN apt-get update && \
RUN apt-get update && apt-get upgrade -y && apt-get autoremove -y && \
Copy link

@rjmunro rjmunro Sep 27, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

It shouldn't make any difference but I would move the autoremove after all the installs - put it last before the apt-get clean, then all the cleanup stuff is happening last and will clean everything it can.

apt-get install -y --no-install-recommends \
curl \
gnupg \
Expand All @@ -50,6 +51,7 @@ RUN apt-get update && \
libpq-dev \
# ODBC support:
g++ unixodbc-dev \
unixodbc \
# for SAML
xmlsec1 \
# Additional packages required for data sources:
Expand Down