Skip to content

Commit

Permalink
Do not include elemental-toolkit sources (#400)
Browse files Browse the repository at this point in the history
* Do not include elemental-toolkit sources
* Remove framework bump workflow

Signed-off-by: David Cassany <dcassany@suse.com>
  • Loading branch information
davidcassany authored Oct 7, 2022
1 parent 7b8897e commit d7d0b36
Show file tree
Hide file tree
Showing 41 changed files with 16 additions and 1,183 deletions.
24 changes: 0 additions & 24 deletions .github/workflows/bump_framework.yaml

This file was deleted.

16 changes: 13 additions & 3 deletions Dockerfile.image
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,23 @@ COPY framework/files/etc/luet/luet.yaml /etc/luet/luet.yaml
ENV LUET_NOLOCK=true
SHELL ["/usr/bin/luet", "install", "-y", "--system-target", "/framework"]

# elemental-toolkit essentials
RUN system/immutable-rootfs
RUN system/cos-setup
RUN cloud-config/network
RUN cloud-config/recovery
RUN cloud-config/live
RUN cloud-config/boot-assessment
RUN cloud-config/default-services
RUN system/grub2-config
RUN system/base-dracut-modules

# elemental-toolkit utilities
RUN utils/k9s
RUN utils/nerdctl
RUN toolchain/cosign
RUN selinux/rancher


# elemental-operator
FROM $OPERATOR_IMAGE as elemental-operator

Expand Down Expand Up @@ -45,11 +56,10 @@ COPY --from=system-agent /usr/bin/rancher-system-agent /usr/sbin/elemental-syste
COPY --from=elemental-cli /usr/bin/elemental /usr/bin/elemental

# Copy local framework files
COPY framework/cos/ /
COPY framework/files/ /

# Enable services
RUN systemctl enable NetworkManager
RUN systemctl enable NetworkManager sshd elemental-populate-node-labels

ARG IMAGE_TAG=latest
ARG IMAGE_COMMIT=""
Expand Down
10 changes: 0 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,3 @@ build_all: build iso extract_kernel_init_squash ipxe
.PHONY: docs
docs:
mkdocs build

_FW_CMD=apk add curl && ( curl -L https://raw.githubusercontent.com/rancher-sandbox/cOS-toolkit/master/scripts/get_luet.sh | sh ) && luet install --system-target /framework -y $(FRAMEWORK_PACKAGES) && rm -rf /framework/var/luet
update-cos-framework:
@echo "Cleanup generated files"
$(SUDO) rm -rf $(ROOT_DIR)/framework/cos
docker run --rm --entrypoint /bin/sh \
-v $(ROOT_DIR)/framework/cos:/framework \
alpine -c \
"$(_FW_CMD)"
$(SUDO) chown -R $$(id -u) $(ROOT_DIR)/framework/cos
7 changes: 0 additions & 7 deletions framework/README.md

This file was deleted.

8 changes: 0 additions & 8 deletions framework/cos/etc/cos/bootargs.cfg

This file was deleted.

62 changes: 0 additions & 62 deletions framework/cos/etc/cos/config

This file was deleted.

102 changes: 0 additions & 102 deletions framework/cos/etc/cos/grub.cfg

This file was deleted.

4 changes: 0 additions & 4 deletions framework/cos/etc/cos/grubenv_firstboot

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions framework/cos/etc/dracut.conf.d/02-cos-setup-initramfs.conf

This file was deleted.

5 changes: 0 additions & 5 deletions framework/cos/etc/dracut.conf.d/50-cos-initrd.conf

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

25 changes: 0 additions & 25 deletions framework/cos/etc/systemd/system/tmp.mount

This file was deleted.

11 changes: 0 additions & 11 deletions framework/cos/lib/systemd/system/cos-setup-boot.service

This file was deleted.

14 changes: 0 additions & 14 deletions framework/cos/lib/systemd/system/cos-setup-fs.service

This file was deleted.

16 changes: 0 additions & 16 deletions framework/cos/lib/systemd/system/cos-setup-initramfs.service

This file was deleted.

16 changes: 0 additions & 16 deletions framework/cos/lib/systemd/system/cos-setup-network.service

This file was deleted.

15 changes: 0 additions & 15 deletions framework/cos/lib/systemd/system/cos-setup-reconcile.service

This file was deleted.

Loading

0 comments on commit d7d0b36

Please sign in to comment.