fix: cache dnf installs (and remove cache from images)

This commit is contained in:
Job
2025-12-29 17:10:28 +01:00
parent 4bf4addd5a
commit ea482aa61f
4 changed files with 14 additions and 9 deletions

View File

@@ -3,7 +3,9 @@ ARG studio_version="2025.1.4.8"
ARG download_uri="https://redirector.gvt1.com/edgedl/android/studio/ide-zips/${studio_version}/android-studio-${studio_version}-linux.tar.gz" ARG download_uri="https://redirector.gvt1.com/edgedl/android/studio/ide-zips/${studio_version}/android-studio-${studio_version}-linux.tar.gz"
USER root USER root
RUN dnf -y install libXext libXrender libXtst libX11 freetype freetype-devel mesa-libGLU
RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
dnf -y --setopt=keepcache=1 install libXext libXrender libXtst libX11 freetype freetype-devel mesa-libGLU
USER user USER user
RUN curl -Lo /tmp/studio.tar.gz "${download_uri}" && \ RUN curl -Lo /tmp/studio.tar.gz "${download_uri}" && \
@@ -15,4 +17,4 @@ RUN curl -Lo /tmp/studio.tar.gz "${download_uri}" && \
RUN echo 'alias studio="$HOME/AndroidStudio/bin/studio"' >> /home/user/.bashrc RUN echo 'alias studio="$HOME/AndroidStudio/bin/studio"' >> /home/user/.bashrc
RUN echo 'export ANDROID_HOME="$HOME/Android/Sdk"' >> /home/user/.bashrc RUN echo 'export ANDROID_HOME="$HOME/Android/Sdk"' >> /home/user/.bashrc
RUN echo 'export PATH="$ANDROID_HOME/platform-tools:$PATH"' >> /home/user/.bashrc RUN echo 'export PATH="$ANDROID_HOME/platform-tools:$PATH"' >> /home/user/.bashrc

View File

@@ -1,10 +1,11 @@
FROM git.plabble.org/maurice/fedora:main FROM git.plabble.org/maurice/fedora:main
USER root USER root
RUN dnf -y install dotnet-sdk-9.0 dotnet-sdk-10.0 RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
dnf -y --setopt=keepcache=1 install dotnet-sdk-9.0 dotnet-sdk-10.0
COPY install-roslyn.sh /tmp/install-roslyn.sh COPY install-roslyn.sh /tmp/install-roslyn.sh
RUN chmod +x /tmp/install-roslyn.sh && /tmp/install-roslyn.sh RUN chmod +x /tmp/install-roslyn.sh && /tmp/install-roslyn.sh
USER user USER user
RUN dotnet tool install --global dotnet-ef RUN dotnet tool install --global dotnet-ef

View File

@@ -1,10 +1,11 @@
FROM quay.io/fedora/fedora:43 FROM quay.io/fedora/fedora:43
# === install system packages === # === install system packages ===
RUN dnf update -y && \ RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
dnf -y install procps ping bash-completion glibc-langpack-en \ dnf update -y && \
dnf -y --setopt=keepcache=1 install procps ping bash-completion glibc-langpack-en \
host-spawn dbus-launch \ host-spawn dbus-launch \
git pnpm helix zip git pnpm helix zip
# === setup user === # === setup user ===
RUN useradd -ms /bin/bash user && \ RUN useradd -ms /bin/bash user && \

View File

@@ -3,7 +3,8 @@ ARG rider_version="2025.3.0.3"
ARG download_uri="https://download.jetbrains.com/rider/JetBrains.Rider-${rider_version}.tar.gz" ARG download_uri="https://download.jetbrains.com/rider/JetBrains.Rider-${rider_version}.tar.gz"
USER root USER root
RUN dnf -y install libXext libXrender libXtst libX11 freetype freetype-devel RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
dnf -y --setopt=keepcache=1 install libXext libXrender libXtst libX11 freetype freetype-devel
USER user USER user
RUN curl -Lo /tmp/rider.tar.gz "${download_uri}" && \ RUN curl -Lo /tmp/rider.tar.gz "${download_uri}" && \
@@ -12,4 +13,4 @@ RUN curl -Lo /tmp/rider.tar.gz "${download_uri}" && \
rm /tmp/rider.tar.gz && \ rm /tmp/rider.tar.gz && \
mv /home/user/Rider/JetBrains*/* /home/user/Rider mv /home/user/Rider/JetBrains*/* /home/user/Rider
RUN echo 'alias rider="$HOME/Rider/bin/rider"' >> /home/user/.bashrc RUN echo 'alias rider="$HOME/Rider/bin/rider"' >> /home/user/.bashrc