mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 02:47:56 +01:00
feat: Sync from downstream (#21)
This commit is contained in:
parent
76fa2f0c9e
commit
f1756f7da5
10 changed files with 24 additions and 15 deletions
|
|
@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -11,3 +11,4 @@
|
|||
/lorax.conf
|
||||
/output
|
||||
/*.log
|
||||
|
||||
|
|
|
|||
|
|
@ -22,4 +22,5 @@ RUN dnf install -y make && make install-deps
|
|||
|
||||
VOLUME /build-container-installer/build
|
||||
|
||||
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
|
||||
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
|
||||
|
||||
|
|
|
|||
6
Makefile
6
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
|
||||
.PHONY: clean install-deps
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
```
|
||||
```
|
||||
|
||||
|
|
|
|||
|
|
@ -52,3 +52,4 @@ runs:
|
|||
IMAGE_TAG=${{ inputs.image_tag || inputs.version }} \
|
||||
WEB_UI=${{ inputs.web_ui }} \
|
||||
"ADDITIONAL_TEMPLATES=${{ inputs.additional_templates }}"
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
chmod -R ugo=rwX /github/workspace/build
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
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"
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
append usr/share/anaconda/interactive-defaults.ks "ostreecontainer --url=/run/install/repo/${IMAGE_NAME}-${IMAGE_TAG} --transport=oci --no-signature-verification"
|
||||
append usr/share/anaconda/interactive-defaults.ks "ostreecontainer --url=/run/install/repo/${IMAGE_NAME}-${IMAGE_TAG} --transport=oci --no-signature-verification"
|
||||
|
||||
|
|
|
|||
|
|
@ -12,4 +12,5 @@ do
|
|||
echo "-chmod 0444 ${file}"
|
||||
done
|
||||
popd > /dev/null
|
||||
echo "-end"
|
||||
echo "-end"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue