diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e9e68346..ff7b4b5d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,7 +4,7 @@ "name": "Existing Dockerfile", // "build": { // "context": "..", - // "dockerfile": "../Dockerfile", + // "dockerfile": "../Containerfile", // "args": { // "version": "39" // } @@ -13,4 +13,5 @@ "overrideCommand": true, "shutdownAction": "stopContainer", "privileged": true -} \ No newline at end of file +} + diff --git a/.gitignore b/.gitignore index 0a803828..8f65d56d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /lorax.conf /output /*.log + diff --git a/Containerfile b/Containerfile index 16f26d82..196a1512 100644 --- a/Containerfile +++ b/Containerfile @@ -22,4 +22,5 @@ RUN dnf install -y make && make install-deps VOLUME /build-container-installer/build -ENTRYPOINT ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/bin/bash", "/entrypoint.sh"] + diff --git a/Makefile b/Makefile index c272d520..0ef451f5 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.t # Step 1: Generate Lorax Templates lorax_templates/%.tmpl: lorax_templates/%.tmpl.in - $(eval _VARS = IMAGE_NAME IMAGE_TAG IMAGE_REPO_DOUBLE_ESCAPED) + $(eval _VARS = IMAGE_NAME IMAGE_TAG _IMAGE_REPO_DOUBLE_ESCAPED) $(foreach var,$(_VARS),$(var)=$($(var))) envsubst '$(foreach var,$(_VARS),$$$(var))' < $(_BASE_DIR)/lorax_templates/$*.tmpl.in > $(_BASE_DIR)/lorax_templates/$*.tmpl @@ -98,9 +98,9 @@ clean: rm -f $(_BASE_DIR)/lorax.conf || true rm -f $(_BASE_DIR)/*.iso || true rm -f $(_BASE_DIR)/*.log || true - install-deps: dnf install -y lorax xorriso podman -.PHONY: clean install-deps \ No newline at end of file +.PHONY: clean install-deps + diff --git a/README.md b/README.md index e227c434..3c80ebbe 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ Use existing container image: "name": "Existing Dockerfile", // "build": { // "context": "..", - // "dockerfile": "../Dockerfile", + // "dockerfile": "../Containerfile", // "args": { // "version": "39" // } @@ -95,7 +95,7 @@ Build a new container image: "name": "Existing Dockerfile", "build": { "context": "..", - "dockerfile": "../Dockerfile", + "dockerfile": "../Containerfile", "args": { "version": "39" } @@ -105,4 +105,5 @@ Build a new container image: "shutdownAction": "stopContainer", "privileged": true } -``` \ No newline at end of file +``` + diff --git a/action.yml b/action.yml index f28a7fec..3dd40422 100644 --- a/action.yml +++ b/action.yml @@ -52,3 +52,4 @@ runs: IMAGE_TAG=${{ inputs.image_tag || inputs.version }} \ WEB_UI=${{ inputs.web_ui }} \ "ADDITIONAL_TEMPLATES=${{ inputs.additional_templates }}" + diff --git a/entrypoint.sh b/entrypoint.sh index bb13346c..50057378 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -21,4 +21,5 @@ mkdir /github/workspace/build || true # Copy resulting iso to github workspace and fix permissions cp build/deploy.iso /github/workspace/build -chmod -R ugo=rwX /github/workspace/build \ No newline at end of file +chmod -R ugo=rwX /github/workspace/build + diff --git a/lorax_templates/configure_upgrades.tmpl.in b/lorax_templates/configure_upgrades.tmpl.in index b0d13114..eb75fa79 100644 --- a/lorax_templates/configure_upgrades.tmpl.in +++ b/lorax_templates/configure_upgrades.tmpl.in @@ -1,7 +1,8 @@ append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail" -append usr/share/anaconda/interactive-defaults.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/${IMAGE_REPO_DOUBLE_ESCAPED}\/${IMAGE_NAME}:${IMAGE_TAG}/' /ostree/deploy/default/deploy/*.origin" +append usr/share/anaconda/interactive-defaults.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/${_IMAGE_REPO_DOUBLE_ESCAPED}\/${IMAGE_NAME}:${IMAGE_TAG}/' /ostree/deploy/default/deploy/*.origin" append usr/share/anaconda/interactive-defaults.ks "%end" append usr/share/anaconda/post-scripts/configure_upgrades.ks "%post --erroronfail" -append usr/share/anaconda/post-scripts/configure_upgrades.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/${IMAGE_REPO_DOUBLE_ESCAPED}\/${IMAGE_NAME}:${IMAGE_TAG}/' /ostree/deploy/default/deploy/*.origin" -append usr/share/anaconda/post-scripts/configure_upgrades.ks "%end" \ No newline at end of file +append usr/share/anaconda/post-scripts/configure_upgrades.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/${_IMAGE_REPO_DOUBLE_ESCAPED}\/${IMAGE_NAME}:${IMAGE_TAG}/' /ostree/deploy/default/deploy/*.origin" +append usr/share/anaconda/post-scripts/configure_upgrades.ks "%end" + diff --git a/lorax_templates/set_installer.tmpl.in b/lorax_templates/set_installer.tmpl.in index 5941b808..66f01e0e 100644 --- a/lorax_templates/set_installer.tmpl.in +++ b/lorax_templates/set_installer.tmpl.in @@ -1 +1,2 @@ -append usr/share/anaconda/interactive-defaults.ks "ostreecontainer --url=/run/install/repo/${IMAGE_NAME}-${IMAGE_TAG} --transport=oci --no-signature-verification" \ No newline at end of file +append usr/share/anaconda/interactive-defaults.ks "ostreecontainer --url=/run/install/repo/${IMAGE_NAME}-${IMAGE_TAG} --transport=oci --no-signature-verification" + diff --git a/xorriso/gen_input.sh.in b/xorriso/gen_input.sh.in index c4914d5a..b660e1b3 100644 --- a/xorriso/gen_input.sh.in +++ b/xorriso/gen_input.sh.in @@ -12,4 +12,5 @@ do echo "-chmod 0444 ${file}" done popd > /dev/null -echo "-end" \ No newline at end of file +echo "-end" +