From 51652f7dd204da8c7c860abc22e371b6ab068068 Mon Sep 17 00:00:00 2001
From: sethsimmons <sethsimmons@protonmail.com>
Date: Fri, 4 Jun 2021 09:29:20 -0400
Subject: [PATCH] Enable package upgrades in Dockerfile and disable caching in
 weekly builds

---
 .github/workflows/update-base-image.yml | 2 --
 Dockerfile                              | 8 ++++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/update-base-image.yml b/.github/workflows/update-base-image.yml
index 62a736d..e390149 100644
--- a/.github/workflows/update-base-image.yml
+++ b/.github/workflows/update-base-image.yml
@@ -45,8 +45,6 @@ jobs:
             org.opencontainers.image.source=${{ github.event.repository.html_url }}
             org.opencontainers.image.created=${{ steps.prep.outputs.created }}
             org.opencontainers.image.revision=${{ github.sha }}
-          cache-from: type=registry,ref=${{ secrets.DOCKER_USERNAME }}/simple-monerod:latest
-          cache-to: type=inline
       - 
         name: Scan new image and output results
         uses: Azure/container-scan@v0
diff --git a/Dockerfile b/Dockerfile
index da5b327..1d107f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,9 @@ LABEL author="sethsimmons@pm.me" \
 
 # Dependency list from https://github.com/monero-project/monero#compiling-monero-from-source
 # Added DEBIAN_FRONTEND=noninteractive to workaround tzdata prompt on installation
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends build-essential cmake \
+RUN apt-get update \
+    && apt-get upgrade -y \
+    && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends build-essential cmake \
     pkg-config libboost-all-dev libssl-dev libzmq3-dev libunbound-dev ca-certificates \
     libsodium-dev libunwind8-dev liblzma-dev libreadline6-dev libldns-dev \
     libexpat1-dev doxygen graphviz libpgm-dev qttools5-dev-tools libhidapi-dev \
@@ -45,7 +47,9 @@ RUN test -z "$NPROC" && nproc > /nproc || echo -n "$NPROC" > /nproc && make -j"$
 FROM ubuntu:20.04
 
 # Install remaining dependencies
-RUN apt-get update && apt-get install --no-install-recommends -y curl libnorm-dev libpgm-dev libgssapi-krb5-2 \
+RUN apt-get update \
+    && apt-get upgrade -y \
+    && apt-get install --no-install-recommends -y curl libnorm-dev libpgm-dev libgssapi-krb5-2 \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*