diff --git a/Makefile b/Makefile index b639308..a1dd261 100644 --- a/Makefile +++ b/Makefile @@ -75,9 +75,10 @@ $(ISO_NAME)-CHECKSUM: $(ISO_NAME) # Build end ISO $(ISO_NAME): results/images/boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt - $(if $(wildcard $(dir $(ISO_NAME))),,mkdir -p $(dir $(ISO_NAME))) + $(if $(wildcard $(dir $(ISO_NAME))),,mkdir -p $(dir $(ISO_NAME)); chmod ugo=rwX $(dir $(ISO_NAME))) xorriso -dialog on < $(_BASE_DIR)/xorriso/input.txt implantisomd5 $(ISO_NAME) + chmod ugo=r $(ISO_NAME) # Build boot.iso using Lorax results/images/boot.iso: external/lorax/branch-$(VERSION) $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES) diff --git a/entrypoint.sh b/entrypoint.sh index 95247bf..ba58634 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -5,16 +5,6 @@ set -ex # Create /dev/loop0 if it doesn't already exist. `losetup` has an issue creating it during the first run mknod -m 0660 /dev/loop0 b 7 0 2>/dev/null || true -for i -do - if [[ ${i} =~ = ]] - then - key=$(echo ${i} | cut -d= -f1) - value=$(echo ${i} | cut -d= -f2-) - export ${key}="${value}" - fi -done - if [[ -d /cache/skopeo ]] then ln -s /cache/skopeo /build-container-installer/container @@ -27,10 +17,3 @@ fi # Run make command make "$@" - -# Make output dir in github workspace -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