update base versions and packages

USEPA · Jun 5, 2024 · 9ac6f27 · 9ac6f27
1 parent 230fdcb
commit 9ac6f27
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/docker/angular/Dockerfile b/docker/angular/Dockerfile
@@ -17,7 +17,7 @@ COPY docker/ /docker
 WORKDIR /app
 
 RUN apk update && \
-	apk upgrade && \
+	apk upgrade --available && \
 	apk add chromium
 
 RUN	npm install --force

diff --git a/docker/flask/Dockerfile b/docker/flask/Dockerfile
@@ -48,5 +48,5 @@ ENV PATH /cyan_flask:$PATH
 
 EXPOSE 5001
 RUN apk del busybox
-#ENTRYPOINT ["tail", "-f", "/dev/null"]
-CMD ["sh", "/docker/flask/start_flask.sh"]
+ENTRYPOINT ["tail", "-f", "/dev/null"]
+#CMD ["sh", "/docker/flask/start_flask.sh"]
diff --git a/docker/mysql/Dockerfile b/docker/mysql/Dockerfile
@@ -1,10 +1,10 @@
-FROM mariadb:11.3.2
+FROM mariadb:11.4.2
 
 ENV APP_USER=mysql
 
 # For Prisma scans:
 RUN apt-get update && \
-	apt-get upgrade -y openssl libksba8
+	apt-get upgrade -y
 
 # For Prisma scans:
 RUN rm -rf /usr/local/bin/gosu

diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
@@ -9,7 +9,7 @@ ARG config=nginx.conf
 # ENV APP_USER=www-data
 
 RUN apk update && \
-	apk upgrade
+	apk upgrade --available
 
 RUN rm -rf /usr/share/nginx/html/* && \
 	rm /etc/nginx/conf.d/default.conf

diff --git a/docker/redis/Dockerfile b/docker/redis/Dockerfile
@@ -1,7 +1,9 @@
-FROM redis:7.2.4-alpine
+FROM redis:7.2.5-alpine
 
 RUN apk add --upgrade apk-tools
-RUN apk upgrade --available
+RUN apk update && \
+	apk upgrade --available
+
 COPY docker/redis/docker-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 RUN apk add --no-cache su-exec