From 9d69f4f9eab8f567c48d13f6834e3a0f9409058b Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sat, 16 Dec 2023 18:50:36 -0600 Subject: [PATCH 1/3] words --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8460978..4a177b1 100644 --- a/README.md +++ b/README.md @@ -9,13 +9,12 @@ use. Some utilities have been left in for convenience (*ie:* `wget`, `less`, `fi Size is *not* a priority for this image/project. Currency *(time, not money)* and convenience *are* the priorities. -The `steamcmd` libraries are made available using `ld.so.conf.d`. -Most other images juggle symlinks instead. +## Tweaks -## Fedora tweaks +The `steamcmd` libraries are made available using `ld.so.conf.d`. This *should* be +preferable to the usual solution: *juggling copies/symlinks*. -These are all for the package manager, `dnf`. -The goal is to both reduce resource usage *and* improve performance: +Below are the adjustments made to the package manager `dnf`. - `max_parallel_downloads`: Raised to the limit of 20. Leverages faster networks / more connections. From 18d39e0c3ca36cf1931ecb3508ca009183d8022a Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sat, 16 Dec 2023 18:50:59 -0600 Subject: [PATCH 2/3] restore utils --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 9c06293..99015d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,9 @@ RUN set -x ; \ dnf --setopt=logdir=/tmp/dnf-prep-logs --setopt=cachedir=/tmp/dnf-prep-cache -qy up ; \ dnf --setopt=logdir=/tmp/dnf-prep-logs --setopt=cachedir=/tmp/dnf-prep-cache -qy install \ util-linux \ + wget \ + less \ + findutils \ ca-certificates \ libgcc.{x86_64,i686} \ libstdc++.{x86_64,i686} \ From 02f272f625930a998efac805717d11e7ccda7db6 Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sat, 16 Dec 2023 18:52:10 -0600 Subject: [PATCH 3/3] gitignore: skip images regardless of name --- .gitignore | 3 ++- build-image-files.sh | 13 +++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 0f96d17..e146bab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -steamcmd-fedora-*.img* *.swp +*.img +*.img.xz diff --git a/build-image-files.sh b/build-image-files.sh index e2f10cc..8e7c16e 100755 --- a/build-image-files.sh +++ b/build-image-files.sh @@ -1,17 +1,14 @@ #!/bin/bash # base vars -NOW=$(date +%s) # epoch timestamp, eg: 1622772927 -BASE_TAG=$(awk '$1 == "FROM" {print $2}' Dockerfile | cut -d\: -f2) # eg: 2.7.1 -BUILD_TAG="fedora-${BASE_TAG}-${NOW}" -IMAGE_FILE="steamcmd-${BUILD_TAG}.img" +IMAGE_FILE="steamcmd-latest.img" -echo "Building image steamcmd:${BUILD_TAG}" -podman build --tag steamcmd:"${BUILD_TAG}" . -podman save localhost/steamcmd:"${BUILD_TAG}" > "${IMAGE_FILE}" +echo "Building image steamcmd:latest" +podman build --no-cache --tag steamcmd:latest . +podman save localhost/steamcmd:latest > "${IMAGE_FILE}" echo "" echo "Wrote ${IMAGE_FILE}, cleaning up" -podman rmi steamcmd:"${BUILD_TAG}" +podman rmi steamcmd:latest echo "" echo "Attempting to compress the image (begin comforting music)" xz --keep --compress -9 --extreme --threads="$(nproc)" "${IMAGE_FILE}"