From 060dc042458e0ba2c2362522fdfba02a2b8fa748 Mon Sep 17 00:00:00 2001 From: hau Date: Wed, 4 Nov 2020 14:53:44 +0700 Subject: [PATCH] podman to replace docker --- Applications/System/systemd-boot.md | 10 ---------- Development/Docker.md | 2 +- Development/Podman.md | 7 +++++++ install-archlinux.md | 2 +- 4 files changed, 9 insertions(+), 12 deletions(-) create mode 100644 Development/Podman.md diff --git a/Applications/System/systemd-boot.md b/Applications/System/systemd-boot.md index 9160ef3..df40048 100644 --- a/Applications/System/systemd-boot.md +++ b/Applications/System/systemd-boot.md @@ -64,13 +64,3 @@ initrd /intel-ucode.img initrd /initramfs-linux-zen.img options root="LABEL=ROOT" rw ``` - -Edit `/boot/loader/entries/archlinux-hardened.conf`: - -```txt -title Arch Linux Hardened -linux /vmlinuz-linux-hardened -initrd /intel-ucode.img -initrd /initramfs-linux-hardened.img -options root="LABEL=ROOT" rw -``` diff --git a/Development/Docker.md b/Development/Docker.md index bfc30e0..94814af 100644 --- a/Development/Docker.md +++ b/Development/Docker.md @@ -2,7 +2,7 @@ | Distribution | Package | | ------------ | ----------------------------------------------------- | -| Arch Linux | `docker` | +| Arch Linux | `docker docker-compose` | | Ubuntu | [See](https://docs.docker.com/engine/install/ubuntu/) | Enable and start service: diff --git a/Development/Podman.md b/Development/Podman.md new file mode 100644 index 0000000..c6b548e --- /dev/null +++ b/Development/Podman.md @@ -0,0 +1,7 @@ +# Podman + +| Distribution | Package | +| ------------ | ------------------------------------- | +| Arch Linux | `podman podman-compose podman-docker` | + +By default Podman requires root. diff --git a/install-archlinux.md b/install-archlinux.md index 0bcc442..93f1c61 100644 --- a/install-archlinux.md +++ b/install-archlinux.md @@ -94,7 +94,7 @@ mount /dev/sdxY /mnt/home ### Installation ```sh -pacstrap /mnt base base-devel linux linux-lts linux-zen linux-hardened linux-firmware man-db man-pages intel-ucode neovim +pacstrap /mnt base base-devel linux linux-lts linux-zen linux-firmware man-db man-pages intel-ucode neovim ``` ### Boot loader