Skip to content

Commit c7221fe

Browse files
authored
Merge pull request DefectDojo#14260 from mtesauro/bugfix-container-changes
Update dockerfiles to ensure underlying OS is always running the late…
2 parents 53c631b + d67fb3a commit c7221fe

File tree

4 files changed

+9
-0
lines changed

4 files changed

+9
-0
lines changed

Dockerfile.django-alpine

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ FROM base AS build
1010
WORKDIR /app
1111
RUN \
1212
apk update && \
13+
apk upgrade --no-cache && \
1314
apk add --no-cache \
1415
gcc \
1516
build-base \
@@ -40,6 +41,7 @@ ARG appuser=defectdojo
4041
ENV appuser=${appuser}
4142
RUN \
4243
apk update && \
44+
apk upgrade --no-cache && \
4345
apk add --no-cache \
4446
openjpeg \
4547
jpeg \

Dockerfile.django-debian

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ FROM base AS build
1010
WORKDIR /app
1111
RUN \
1212
apt-get -y update && \
13+
apt-get -y upgrade && \
1314
apt-get -y install --no-install-recommends \
1415
gcc \
1516
build-essential \
@@ -39,6 +40,7 @@ ARG appuser=defectdojo
3940
ENV appuser=${appuser}
4041
RUN \
4142
apt-get -y update && \
43+
apt-get -y upgrade && \
4244
# ugly fix to install postgresql-client without errors
4345
mkdir -p /usr/share/man/man1 /usr/share/man/man7 && \
4446
apt-get -y install --no-install-recommends \

Dockerfile.integration-tests-debian

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ FROM python:3.13.11-slim-trixie@sha256:51e1a0a317fdb6e170dc791bbeae63fac5272c82f
77
WORKDIR /app
88
RUN \
99
apt-get -y update && \
10+
apt-get -y upgrade && \
1011
apt-get -y install \
1112
git \
1213
wget \
@@ -20,6 +21,7 @@ RUN \
2021
xvfb \
2122
&& \
2223
apt-get clean && \
24+
rm -rf /var/lib/apt/lists && \
2325
true
2426

2527
RUN pip install --no-cache-dir selenium==4.9.0 requests

Dockerfile.nginx-alpine

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ FROM base AS build
1010
WORKDIR /app
1111
RUN \
1212
apk update && \
13+
apk upgrade --no-cache && \
1314
apk add --no-cache \
1415
gcc \
1516
build-base \
@@ -70,12 +71,14 @@ COPY --from=collectstatic /app/static/ /usr/share/nginx/html/static/
7071
COPY wsgi_params nginx/nginx.conf nginx/nginx_TLS.conf /etc/nginx/
7172
COPY docker/entrypoint-nginx.sh /
7273
RUN \
74+
apk upgrade --no-cache && \
7375
apk add --no-cache openssl && \
7476
chmod -R g=u /var/cache/nginx && \
7577
mkdir /var/run/defectdojo && \
7678
chmod -R g=u /var/run/defectdojo && \
7779
mkdir -p /etc/nginx/ssl && \
7880
chmod -R g=u /etc/nginx && \
81+
rm -rf /var/cache/apk/* && \
7982
true
8083
ENV \
8184
DD_UWSGI_PASS="uwsgi_server" \

0 commit comments

Comments
 (0)