Use the overlay.d/ pattern to configure different root based on the C…

…ontainerfile
aleskandro · Nov 12, 2023 · 33b6520 · 33b6520
1 parent e284442
commit 33b6520
Show file tree

Hide file tree

Showing 55 changed files with 8 additions and 2 deletions.
diff --git a/Containerfile b/Containerfile
@@ -75,7 +75,9 @@ RUN set -x; \
         | tee /etc/yum.repos.d/docker-ce.repo \
  && rpm-ostree install docker-ce docker-ce-cli && ostree container commit
 
-COPY root/ /
+COPY overlay.d/01-common/ /
+COPY overlay.d/05-systemd/ /
+COPY overlay.d/10-desktop/ /
 
 RUN set -x; sed -i \
       's/AutomaticUpdatePolicy=.*/AutomaticUpdatePolicy=stage/' \

diff --git a/root/etc/vim/vim.conf.d/.netrwhist → ...d/01-common/etc/vim/vim.conf.d/.netrwhist b/root/etc/vim/vim.conf.d/.netrwhist → ...d/01-common/etc/vim/vim.conf.d/.netrwhist
diff --git a/.../vim.conf.d/autoload/latexlivepreview.vim → .../vim.conf.d/autoload/latexlivepreview.vim b/.../vim.conf.d/autoload/latexlivepreview.vim → .../vim.conf.d/autoload/latexlivepreview.vim
diff --git a/.../etc/vim/vim.conf.d/autoload/nerdtree.vim → .../etc/vim/vim.conf.d/autoload/nerdtree.vim b/.../etc/vim/vim.conf.d/autoload/nerdtree.vim → .../etc/vim/vim.conf.d/autoload/nerdtree.vim
diff --git a/.../vim.conf.d/autoload/nerdtree/ui_glue.vim → .../vim.conf.d/autoload/nerdtree/ui_glue.vim b/.../vim.conf.d/autoload/nerdtree/ui_glue.vim → .../vim.conf.d/autoload/nerdtree/ui_glue.vim
diff --git a/root/etc/vim/vim.conf.d/autoload/plug.vim → ...mmon/etc/vim/vim.conf.d/autoload/plug.vim b/root/etc/vim/vim.conf.d/autoload/plug.vim → ...mmon/etc/vim/vim.conf.d/autoload/plug.vim
diff --git a/...im.conf.d/bundle/nerdtree_plugin_open.vim → ...im.conf.d/bundle/nerdtree_plugin_open.vim b/...im.conf.d/bundle/nerdtree_plugin_open.vim → ...im.conf.d/bundle/nerdtree_plugin_open.vim
diff --git a/...tc/vim/vim.conf.d/ftdetect/javascript.vim → ...tc/vim/vim.conf.d/ftdetect/javascript.vim b/...tc/vim/vim.conf.d/ftdetect/javascript.vim → ...tc/vim/vim.conf.d/ftdetect/javascript.vim
diff --git a/root/etc/vim/vim.conf.d/ftplugin/jsx.vim → ...ommon/etc/vim/vim.conf.d/ftplugin/jsx.vim b/root/etc/vim/vim.conf.d/ftplugin/jsx.vim → ...ommon/etc/vim/vim.conf.d/ftplugin/jsx.vim
diff --git a/root/etc/vim/vim.conf.d/indent/jsx.vim → ...-common/etc/vim/vim.conf.d/indent/jsx.vim b/root/etc/vim/vim.conf.d/indent/jsx.vim → ...-common/etc/vim/vim.conf.d/indent/jsx.vim
diff --git a/...vim/vim.conf.d/latex/latexlivepreview.vim → ...vim/vim.conf.d/latex/latexlivepreview.vim b/...vim/vim.conf.d/latex/latexlivepreview.vim → ...vim/vim.conf.d/latex/latexlivepreview.vim
diff --git a/.../vim/vim.conf.d/lib/nerdtree/bookmark.vim → .../vim/vim.conf.d/lib/nerdtree/bookmark.vim b/.../vim/vim.conf.d/lib/nerdtree/bookmark.vim → .../vim/vim.conf.d/lib/nerdtree/bookmark.vim
diff --git a/...c/vim/vim.conf.d/lib/nerdtree/creator.vim → ...c/vim/vim.conf.d/lib/nerdtree/creator.vim b/...c/vim/vim.conf.d/lib/nerdtree/creator.vim → ...c/vim/vim.conf.d/lib/nerdtree/creator.vim
diff --git a/...etc/vim/vim.conf.d/lib/nerdtree/event.vim → ...etc/vim/vim.conf.d/lib/nerdtree/event.vim b/...etc/vim/vim.conf.d/lib/nerdtree/event.vim → ...etc/vim/vim.conf.d/lib/nerdtree/event.vim
diff --git a/.../vim/vim.conf.d/lib/nerdtree/flag_set.vim → .../vim/vim.conf.d/lib/nerdtree/flag_set.vim b/.../vim/vim.conf.d/lib/nerdtree/flag_set.vim → .../vim/vim.conf.d/lib/nerdtree/flag_set.vim
diff --git a/...c/vim/vim.conf.d/lib/nerdtree/key_map.vim → ...c/vim/vim.conf.d/lib/nerdtree/key_map.vim b/...c/vim/vim.conf.d/lib/nerdtree/key_map.vim → ...c/vim/vim.conf.d/lib/nerdtree/key_map.vim
diff --git a/...m.conf.d/lib/nerdtree/menu_controller.vim → ...m.conf.d/lib/nerdtree/menu_controller.vim b/...m.conf.d/lib/nerdtree/menu_controller.vim → ...m.conf.d/lib/nerdtree/menu_controller.vim
diff --git a/...vim/vim.conf.d/lib/nerdtree/menu_item.vim → ...vim/vim.conf.d/lib/nerdtree/menu_item.vim b/...vim/vim.conf.d/lib/nerdtree/menu_item.vim → ...vim/vim.conf.d/lib/nerdtree/menu_item.vim
diff --git a/.../vim/vim.conf.d/lib/nerdtree/nerdtree.vim → .../vim/vim.conf.d/lib/nerdtree/nerdtree.vim b/.../vim/vim.conf.d/lib/nerdtree/nerdtree.vim → .../vim/vim.conf.d/lib/nerdtree/nerdtree.vim
diff --git a/.../vim/vim.conf.d/lib/nerdtree/notifier.vim → .../vim/vim.conf.d/lib/nerdtree/notifier.vim b/.../vim/vim.conf.d/lib/nerdtree/notifier.vim → .../vim/vim.conf.d/lib/nerdtree/notifier.vim
diff --git a/...tc/vim/vim.conf.d/lib/nerdtree/opener.vim → ...tc/vim/vim.conf.d/lib/nerdtree/opener.vim b/...tc/vim/vim.conf.d/lib/nerdtree/opener.vim → ...tc/vim/vim.conf.d/lib/nerdtree/opener.vim
diff --git a/.../etc/vim/vim.conf.d/lib/nerdtree/path.vim → .../etc/vim/vim.conf.d/lib/nerdtree/path.vim b/.../etc/vim/vim.conf.d/lib/nerdtree/path.vim → .../etc/vim/vim.conf.d/lib/nerdtree/path.vim
diff --git a/...vim.conf.d/lib/nerdtree/tree_dir_node.vim → ...vim.conf.d/lib/nerdtree/tree_dir_node.vim b/...vim.conf.d/lib/nerdtree/tree_dir_node.vim → ...vim.conf.d/lib/nerdtree/tree_dir_node.vim
diff --git a/...im.conf.d/lib/nerdtree/tree_file_node.vim → ...im.conf.d/lib/nerdtree/tree_file_node.vim b/...im.conf.d/lib/nerdtree/tree_file_node.vim → ...im.conf.d/lib/nerdtree/tree_file_node.vim
diff --git a/root/etc/vim/vim.conf.d/lib/nerdtree/ui.vim → ...on/etc/vim/vim.conf.d/lib/nerdtree/ui.vim b/root/etc/vim/vim.conf.d/lib/nerdtree/ui.vim → ...on/etc/vim/vim.conf.d/lib/nerdtree/ui.vim
diff --git a/....conf.d/nerdtree_plugin/exec_menuitem.vim → ....conf.d/nerdtree_plugin/exec_menuitem.vim b/....conf.d/nerdtree_plugin/exec_menuitem.vim → ....conf.d/nerdtree_plugin/exec_menuitem.vim
diff --git a/...im/vim.conf.d/nerdtree_plugin/fs_menu.vim → ...im/vim.conf.d/nerdtree_plugin/fs_menu.vim b/...im/vim.conf.d/nerdtree_plugin/fs_menu.vim → ...im/vim.conf.d/nerdtree_plugin/fs_menu.vim
diff --git a/root/etc/vim/vim.conf.d/plugin/NERD_tree.vim → ...n/etc/vim/vim.conf.d/plugin/NERD_tree.vim b/root/etc/vim/vim.conf.d/plugin/NERD_tree.vim → ...n/etc/vim/vim.conf.d/plugin/NERD_tree.vim
diff --git a/.../etc/vim/vim.conf.d/plugin/indentLine.vim → .../etc/vim/vim.conf.d/plugin/indentLine.vim b/.../etc/vim/vim.conf.d/plugin/indentLine.vim → .../etc/vim/vim.conf.d/plugin/indentLine.vim
diff --git a/root/etc/vim/vim.conf.d/refactor-me.md → ...-common/etc/vim/vim.conf.d/refactor-me.md b/root/etc/vim/vim.conf.d/refactor-me.md → ...-common/etc/vim/vim.conf.d/refactor-me.md
diff --git a/.../etc/vim/vim.conf.d/syntax/indentLine.vim → .../etc/vim/vim.conf.d/syntax/indentLine.vim b/.../etc/vim/vim.conf.d/syntax/indentLine.vim → .../etc/vim/vim.conf.d/syntax/indentLine.vim
diff --git a/root/etc/vim/vim.conf.d/syntax/jsx.vim → ...-common/etc/vim/vim.conf.d/syntax/jsx.vim b/root/etc/vim/vim.conf.d/syntax/jsx.vim → ...-common/etc/vim/vim.conf.d/syntax/jsx.vim
diff --git a/root/etc/vim/vim.conf.d/syntax/nerdtree.vim → ...on/etc/vim/vim.conf.d/syntax/nerdtree.vim b/root/etc/vim/vim.conf.d/syntax/nerdtree.vim → ...on/etc/vim/vim.conf.d/syntax/nerdtree.vim
diff --git a/root/etc/vim/vim.conf.d/syntax/sass.vim → ...common/etc/vim/vim.conf.d/syntax/sass.vim b/root/etc/vim/vim.conf.d/syntax/sass.vim → ...common/etc/vim/vim.conf.d/syntax/sass.vim
diff --git a/root/etc/vim/vim.conf.d/syntax/yaml.vim → ...common/etc/vim/vim.conf.d/syntax/yaml.vim b/root/etc/vim/vim.conf.d/syntax/yaml.vim → ...common/etc/vim/vim.conf.d/syntax/yaml.vim
diff --git a/...conf.d/vim-nerdtree_plugin_open/README.md → ...conf.d/vim-nerdtree_plugin_open/README.md b/...conf.d/vim-nerdtree_plugin_open/README.md → ...conf.d/vim-nerdtree_plugin_open/README.md
diff --git a/...ugin_open/plugin/nerdtree_plugin_open.vim → ...ugin_open/plugin/nerdtree_plugin_open.vim b/...ugin_open/plugin/nerdtree_plugin_open.vim → ...ugin_open/plugin/nerdtree_plugin_open.vim
diff --git a/root/etc/vimrc → overlay.d/01-common/etc/vimrc b/root/etc/vimrc → overlay.d/01-common/etc/vimrc
diff --git a/root/etc/zshrc → overlay.d/01-common/etc/zshrc b/root/etc/zshrc → overlay.d/01-common/etc/zshrc
diff --git a/root/usr/share/zsh/30zinitrc.zsh → ...y.d/01-common/usr/share/zsh/30zinitrc.zsh b/root/usr/share/zsh/30zinitrc.zsh → ...y.d/01-common/usr/share/zsh/30zinitrc.zsh
@@ -54,6 +54,10 @@ exists_or_extract_latest_gh_release "${LOCAL_BIN_PATH}/dive" wagoodman dive "lin
 exists_or_extract_latest_gh_release "${LOCAL_BIN_PATH}/chroma" alecthomas chroma "linux-${LLVM_ARCH}.tar.gz"
 exists_or_install_latest_gh_release operator-framework operator-sdk "operator-sdk_linux_${LLVM_ARCH}" ${LOCAL_BIN_PATH}/operator-sdk
 
+# symbolic link for kubectl -> oc
+#
+ln -s "${LOCAL_BIN_PATH}/oc" "${LOCAL_BIN_PATH}/kubectl"
+
 [ -f "${LOCAL_BIN_PATH}"/helm ] || {
   export HELM_INSTALL_DIR="${LOCAL_BIN_PATH}"
   curl -fsSL https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash

diff --git a/root/usr/share/zsh/99magic-dots.zsh → .../01-common/usr/share/zsh/99magic-dots.zsh b/root/usr/share/zsh/99magic-dots.zsh → .../01-common/usr/share/zsh/99magic-dots.zsh
diff --git a/....conf.d/90-journal-max-retention-sec.conf → ....conf.d/90-journal-max-retention-sec.conf b/....conf.d/90-journal-max-retention-sec.conf → ....conf.d/90-journal-max-retention-sec.conf
diff --git a/...r/lib/systemd/system/lower-priority.slice → ...r/lib/systemd/system/lower-priority.slice b/...r/lib/systemd/system/lower-priority.slice → ...r/lib/systemd/system/lower-priority.slice
diff --git a/...treed.service.d/lower-priority-slice.conf → ...treed.service.d/lower-priority-slice.conf b/...treed.service.d/lower-priority-slice.conf → ...treed.service.d/lower-priority-slice.conf
diff --git a/root/etc/docker/daemon.json → overlay.d/10-desktop/etc/docker/daemon.json b/root/etc/docker/daemon.json → overlay.d/10-desktop/etc/docker/daemon.json
diff --git a/root/usr/bin/yamaha-controld.sh → ...y.d/10-desktop/usr/bin/yamaha-controld.sh b/root/usr/bin/yamaha-controld.sh → ...y.d/10-desktop/usr/bin/yamaha-controld.sh
diff --git a/...emd/system-preset/97-fedora-custom.preset → ...emd/system-preset/97-fedora-custom.preset b/...emd/system-preset/97-fedora-custom.preset → ...emd/system-preset/97-fedora-custom.preset
diff --git a/...emd/system/ensure-flatpak-flathub.service → ...emd/system/ensure-flatpak-flathub.service b/...emd/system/ensure-flatpak-flathub.service → ...emd/system/ensure-flatpak-flathub.service
diff --git a/...lib/systemd/system/ensure-flatpak.service → ...lib/systemd/system/ensure-flatpak.service b/...lib/systemd/system/ensure-flatpak.service → ...lib/systemd/system/ensure-flatpak.service
diff --git a/root/usr/lib/systemd/system/[email protected] → ...p/usr/lib/systemd/system/[email protected] b/root/usr/lib/systemd/system/[email protected] → ...p/usr/lib/systemd/system/[email protected]
diff --git a/.../systemd/system/initramfs-rebuild.service → .../systemd/system/initramfs-rebuild.service b/.../systemd/system/initramfs-rebuild.service → .../systemd/system/initramfs-rebuild.service
diff --git a/...lib/systemd/user/[email protected] → ...lib/systemd/user/[email protected] b/...lib/systemd/user/[email protected] → ...lib/systemd/user/[email protected]
diff --git a/...sr/share/ensure-flatpak/applications.list → ...sr/share/ensure-flatpak/applications.list b/...sr/share/ensure-flatpak/applications.list → ...sr/share/ensure-flatpak/applications.list
diff --git a/...are/pipewire/pipewire.conf.d/99-raop.conf → ...are/pipewire/pipewire.conf.d/99-raop.conf b/...are/pipewire/pipewire.conf.d/99-raop.conf → ...are/pipewire/pipewire.conf.d/99-raop.conf
diff --git a/toolbox.Containerfile b/toolbox.Containerfile
@@ -21,7 +21,7 @@ RUN set -x; arch=$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/'); cat /etc/
 RUN dnf -y groupinstall "Development Tools" && dnf clean all
 
 
-COPY root/ /
+COPY overlay.d/01-common/ /
 
 RUN HOME=/tmp RUNZSH=no CHSH=no ZSH=/usr/lib/ohmyzsh \
     sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" \