From a8b37d3240a6d0da558349cc934b4ba3f77a66f9 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Sat, 13 Jan 2024 14:42:18 +0100 Subject: [PATCH] Cleanup and rebuild image --- images/boardgame-manager/Dockerfile | 7 +++---- variables.yml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/images/boardgame-manager/Dockerfile b/images/boardgame-manager/Dockerfile index 63ceff3..7506937 100644 --- a/images/boardgame-manager/Dockerfile +++ b/images/boardgame-manager/Dockerfile @@ -2,9 +2,8 @@ FROM [[ .docker.repo ]][[ .docker.base_images.alma9.image ]] MAINTAINER [[ .docker.maintainer ]] RUN set -eux &&\ - microdnf -y --best --nodocs --noplugins --setopt=install_weak_deps=0 update &&\ rpm -qa --qf "%{NAME}\n" | sort > /tmp/before.txt &&\ - microdnf -y --best --nodocs --noplugins --setopt=install_weak_deps=0 install git npm unzip &&\ + dnf -y install git npm unzip &&\ rpm -qa --qf "%{NAME}\n" | sort > /tmp/after.txt &&\ curl -fsSL https://bun.sh/install | BUN_INSTALL=/usr/local bash &&\ cd /opt/ &&\ @@ -12,8 +11,8 @@ RUN set -eux &&\ cd bgm &&\ bun install &&\ npm install sqlite3 --save &&\ - microdnf remove -y $(comm -13 /tmp/before.txt /tmp/after.txt) &&\ - microdnf clean all &&\ + dnf -y remove $(comm -13 /tmp/before.txt /tmp/after.txt) &&\ + dnf clean all &&\ rm -rf /var/cache/yum/* /var/log/yum/* /tmp/before.txt /tmp/after.txt /var/lib/dnf/history* EXPOSE 8080 diff --git a/variables.yml b/variables.yml index 041020c..e146350 100644 --- a/variables.yml +++ b/variables.yml @@ -6,7 +6,7 @@ instance: boardgame-manager bgm: # Image to use - image: '[[ .docker.repo ]]boardgame-manager:latest' + image: '[[ .docker.repo ]]boardgame-manager:24.1-1' # Resource allocation for the container resources: