Skip to content

Commit

Permalink
Merge pull request #2 from detiber/minor-cleanup
Browse files Browse the repository at this point in the history
[chore] minor cleanup
  • Loading branch information
tulilirockz authored Dec 18, 2024
2 parents d8c1338 + a9f3466 commit 727b11f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Containerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG MAJOR_VERSION="${CENTOS_MAJOR_VERSION:-stream10}"
ARG MAJOR_VERSION="${MAJOR_VERSION:-stream10}"

FROM quay.io/centos-bootc/centos-bootc:$MAJOR_VERSION

Expand Down
5 changes: 3 additions & 2 deletions Justfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
repo_organization := "centos-workstation"
image_name := "main"
iso_builder_image := "ghcr.io/jasonn3/build-container-installer:v1.2.3"

[private]
default:
Expand Down Expand Up @@ -77,7 +76,7 @@ build centos_version="stream10" tag="latest":
fi

BUILD_ARGS=()
BUILD_ARGS+=("--build-arg" "CENTOS_MAJOR_VERSION=${centos_version}")
BUILD_ARGS+=("--build-arg" "MAJOR_VERSION=${centos_version}")
# BUILD_ARGS+=("--build-arg" "IMAGE_NAME=${image_name}")
# BUILD_ARGS+=("--build-arg" "IMAGE_VENDOR={{ repo_organization }}")
if [[ -z "$(git status -s)" ]]; then
Expand Down Expand Up @@ -105,7 +104,9 @@ build-vm image type="qcow2":
if ! sudo podman image exists $TARGET_IMAGE ; then
echo "Ensuring image is on root storage"
COPYTMP=$(mktemp -p "${PWD}" -d -t _build_podman_scp.XXXXXXXXXX)
sudo podman image scp $USER@localhost::$TARGET_IMAGE root@localhost::
rm -rf "${COPYTMP}"
fi

echo "Cleaning up previous build"
Expand Down

0 comments on commit 727b11f

Please sign in to comment.