From 302c23d2b18f9472acc08a86daf8258b2df181f9 Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Thu, 15 Apr 2021 16:37:47 +1000
Subject: [PATCH] DCD-1271: Re-add package upgrades and add corresponding
 linting override.

---
 .hadolint.yaml    | 2 ++
 Dockerfile        | 1 +
 Dockerfile-alpine | 1 +
 3 files changed, 4 insertions(+)

diff --git a/.hadolint.yaml b/.hadolint.yaml
index c592c1e..1b65cf1 100644
--- a/.hadolint.yaml
+++ b/.hadolint.yaml
@@ -1,4 +1,6 @@
 ignored:
+  - DL3005 # Package upgrades
+  - DL3017 # Package upgrades
   - DL3006 # Version tagging
   - DL3008 # Pinning
   - DL3018 # Pinning
diff --git a/Dockerfile b/Dockerfile
index 53bb528..efe13e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,7 @@ CMD ["/entrypoint.py"]
 ENTRYPOINT ["/usr/bin/tini", "--"]
 
 RUN apt-get update \
+    && apt-get upgrade -y \
     && apt-get install -y --no-install-recommends fontconfig fonts-noto python3 python3-jinja2 tini \
     && apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
 
diff --git a/Dockerfile-alpine b/Dockerfile-alpine
index c7367bf..7b77ee3 100644
--- a/Dockerfile-alpine
+++ b/Dockerfile-alpine
@@ -23,6 +23,7 @@ CMD ["/entrypoint.py"]
 ENTRYPOINT ["/sbin/tini", "--"]
 
 RUN apk update \
+    && apk upgrade \
     && apk add --no-cache ca-certificates wget curl openssh bash procps openssl perl tini python3 py3-jinja2 ttf-dejavu `apk search -qe 'font-noto*'` \
     && rm -f /var/cache/apk/APKINDEX*