From ceb22e62e60bf06d2421e73101514def1e8d7f57 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Jul 12 2017 15:39:07 +0000 Subject: Rename treefile to match ref We changed the ref name to drop `docker`, this changes the treefile. I left a symlink for compatibility. (cherry picked from commit 0d20b56e68ad88e8569ce1dcfe7b3c96818455b7) Signed-off-by: Dusty Mabe --- diff --git a/fedora-atomic-docker-host.json b/fedora-atomic-docker-host.json deleted file mode 100644 index 84804a1..0000000 --- a/fedora-atomic-docker-host.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "ref": "fedora/26/${basearch}/atomic-host", - - "repos": ["fedora-26", "fedora-26-updates", "fedora-26-updates-testing"], - - "selinux": true, - - "documentation": false, - - "automatic_version_prefix": "26", - "mutate-os-release": "26", - - "initramfs-args": ["--no-hostonly", "--add", "iscsi"], - - "install-langs-comment": "Keep this in sync with treecompose-post.sh", - "install-langs": [ - "pt_BR", - "fr", - "fr_FR", - "de", - "de_DE", - "it", - "it_IT", - "ru", - "ru_RU", - "es", - "es_ES", - "en_US", - "zh_CN", - "ja", - "ja_JP", - "ko", - "ko_KR", - "zh_TW", - "as", - "as_IN", - "bn", - "bn_IN", - "gu", - "gu_IN", - "hi", - "hi_IN", - "kn", - "kn_IN", - "ml", - "ml_IN", - "mr", - "mr_IN", - "or", - "or_IN", - "pa", - "pa_IN", - "ta", - "ta_IN", - "te", - "te_IN" - ], - - "postprocess-script": "treecompose-post.sh", - - "etc-group-members": ["wheel", "docker"], - - "ignore-removed-users": ["root"], - "ignore-removed-groups": ["root"], - "check-passwd": { "type": "file", "filename": "passwd" }, - "check-groups": { "type": "file", "filename": "group" }, - - "packages": ["atomic", - "glibc", "nss-altfiles", "shadow-utils", - "sssd-client", "libsss_sudo", - "fedora-release-atomichost", - "dracut-config-generic", "kernel", - "dracut-network", - "rpm-ostree", "lvm2", - "chrony", - "cryptsetup", - "authconfig", - "btrfs-progs", "e2fsprogs", "xfsprogs", - "gnupg2", - "basesystem", - "python", - "bash", - "xz", "gzip", "bzip2", - "coreutils", - "bridge-utils", - "which", - "nfs-utils", - "curl", - "iptables-services", "iptables", - "NetworkManager", - "dnsmasq", - "hostname", "initscripts", "iproute", "iputils", "less", - "sos", - "openssh-clients", "openssh-server", "passwd", - "policycoreutils", "procps-ng", "rootfiles", "rpm", - "selinux-policy-targeted", "setup", "shadow-utils", - "sudo", "systemd", "util-linux", "vim-minimal", - "less", - "tar", - "cloud-init", - "cloud-utils-growpart", - "rsync", - "bash-completion", - "tmux", "screen", - "strace", "lsof", "tcpdump", "nmap-ncat", - "policycoreutils-python", - "policycoreutils-python-utils", - "setools-console", - "audit", - "cockpit-bridge", - "cockpit-system", - "cockpit-docker", - "cockpit-networkmanager", - "cockpit-ostree", - "kubernetes", "etcd", - "flannel", - "docker", - "python-docker-py", - "iscsi-initiator-utils", - "glusterfs", "glusterfs-fuse", - "ceph-common", - "oddjob-mkhomedir", - "oci-register-machine", - "oci-systemd-hook", - "mdadm", - "runc", - "attr"], - - "packages-aarch64": ["grub2-efi", "ostree-grub2", - "efibootmgr", "shim", "atomic-devmode"], - - "packages-armhfp": ["extlinux-bootloader"], - - "packages-ppc64": ["grub2", "ostree-grub2", "atomic-devmode"], - - "packages-ppc64le": ["grub2", "ostree-grub2", "atomic-devmode"], - - "packages-x86_64": ["grub2", "grub2-efi", "ostree-grub2", - "efibootmgr", "shim", "atomic-devmode"], - - "default_target": "multi-user.target", - - "units": ["docker.service", "cockpit.socket", "docker-storage-setup.service"] -} diff --git a/fedora-atomic-docker-host.json b/fedora-atomic-docker-host.json new file mode 120000 index 0000000..ef7f1e1 --- /dev/null +++ b/fedora-atomic-docker-host.json @@ -0,0 +1 @@ +fedora-atomic-host.json \ No newline at end of file diff --git a/fedora-atomic-host.json b/fedora-atomic-host.json new file mode 100644 index 0000000..84804a1 --- /dev/null +++ b/fedora-atomic-host.json @@ -0,0 +1,144 @@ +{ + "ref": "fedora/26/${basearch}/atomic-host", + + "repos": ["fedora-26", "fedora-26-updates", "fedora-26-updates-testing"], + + "selinux": true, + + "documentation": false, + + "automatic_version_prefix": "26", + "mutate-os-release": "26", + + "initramfs-args": ["--no-hostonly", "--add", "iscsi"], + + "install-langs-comment": "Keep this in sync with treecompose-post.sh", + "install-langs": [ + "pt_BR", + "fr", + "fr_FR", + "de", + "de_DE", + "it", + "it_IT", + "ru", + "ru_RU", + "es", + "es_ES", + "en_US", + "zh_CN", + "ja", + "ja_JP", + "ko", + "ko_KR", + "zh_TW", + "as", + "as_IN", + "bn", + "bn_IN", + "gu", + "gu_IN", + "hi", + "hi_IN", + "kn", + "kn_IN", + "ml", + "ml_IN", + "mr", + "mr_IN", + "or", + "or_IN", + "pa", + "pa_IN", + "ta", + "ta_IN", + "te", + "te_IN" + ], + + "postprocess-script": "treecompose-post.sh", + + "etc-group-members": ["wheel", "docker"], + + "ignore-removed-users": ["root"], + "ignore-removed-groups": ["root"], + "check-passwd": { "type": "file", "filename": "passwd" }, + "check-groups": { "type": "file", "filename": "group" }, + + "packages": ["atomic", + "glibc", "nss-altfiles", "shadow-utils", + "sssd-client", "libsss_sudo", + "fedora-release-atomichost", + "dracut-config-generic", "kernel", + "dracut-network", + "rpm-ostree", "lvm2", + "chrony", + "cryptsetup", + "authconfig", + "btrfs-progs", "e2fsprogs", "xfsprogs", + "gnupg2", + "basesystem", + "python", + "bash", + "xz", "gzip", "bzip2", + "coreutils", + "bridge-utils", + "which", + "nfs-utils", + "curl", + "iptables-services", "iptables", + "NetworkManager", + "dnsmasq", + "hostname", "initscripts", "iproute", "iputils", "less", + "sos", + "openssh-clients", "openssh-server", "passwd", + "policycoreutils", "procps-ng", "rootfiles", "rpm", + "selinux-policy-targeted", "setup", "shadow-utils", + "sudo", "systemd", "util-linux", "vim-minimal", + "less", + "tar", + "cloud-init", + "cloud-utils-growpart", + "rsync", + "bash-completion", + "tmux", "screen", + "strace", "lsof", "tcpdump", "nmap-ncat", + "policycoreutils-python", + "policycoreutils-python-utils", + "setools-console", + "audit", + "cockpit-bridge", + "cockpit-system", + "cockpit-docker", + "cockpit-networkmanager", + "cockpit-ostree", + "kubernetes", "etcd", + "flannel", + "docker", + "python-docker-py", + "iscsi-initiator-utils", + "glusterfs", "glusterfs-fuse", + "ceph-common", + "oddjob-mkhomedir", + "oci-register-machine", + "oci-systemd-hook", + "mdadm", + "runc", + "attr"], + + "packages-aarch64": ["grub2-efi", "ostree-grub2", + "efibootmgr", "shim", "atomic-devmode"], + + "packages-armhfp": ["extlinux-bootloader"], + + "packages-ppc64": ["grub2", "ostree-grub2", "atomic-devmode"], + + "packages-ppc64le": ["grub2", "ostree-grub2", "atomic-devmode"], + + "packages-x86_64": ["grub2", "grub2-efi", "ostree-grub2", + "efibootmgr", "shim", "atomic-devmode"], + + "default_target": "multi-user.target", + + "units": ["docker.service", "cockpit.socket", "docker-storage-setup.service"] +}