fix: many bugs

This commit is contained in:
Lennard Brinkhaus 2023-09-13 23:40:39 +02:00
parent 1bfabcde5e
commit 17a87b6083
Signed by: lennard.brinkhaus
GPG Key ID: 286421EC53998B22
9 changed files with 58 additions and 23 deletions

View File

@ -13,7 +13,7 @@ podman_crun_buildpath: "{{ podman_buildpath }}/crun"
podman_podman_buildpath: "{{ podman_buildpath }}/podman" podman_podman_buildpath: "{{ podman_buildpath }}/podman"
podman_netavark_buildpath: "{{ podman_buildpath }}/netavark" podman_netavark_buildpath: "{{ podman_buildpath }}/netavark"
podman_containers_config: "/etc/containers" podman_containers_config: "/usr/share/containers/"
podman_netavark_repopath: "https://github.com/containers/netavark.git" podman_netavark_repopath: "https://github.com/containers/netavark.git"
podman_aardvark_dns_repopath: "https://github.com/containers/aardvark-dns.git" podman_aardvark_dns_repopath: "https://github.com/containers/aardvark-dns.git"

View File

@ -2,50 +2,65 @@
file: file:
path: "{{ podman_containers_config }}" path: "{{ podman_containers_config }}"
state: directory state: directory
mode: 'u=rwx,g=rx,o=' mode: '755'
- name: "Create conatiners folder"
file:
path: "/etc/containers"
state: directory
mode: '755'
- name: "Create config and data directory" - name: "Create config and data directory"
ansible.builtin.file: ansible.builtin.file:
path: "{{ item }}" path: "{{ item }}"
state: directory state: directory
mode: '0755' mode: '755'
with_items: with_items:
- "{{ podman_containers_config }}" - "{{ podman_containers_config }}"
- "{{ podman_containers_config }}/registries.conf.d" - "{{ podman_containers_config }}/registries.conf.d"
- "/etc/containers/registries.conf.d"
- name: Copy policy.json - name: Copy policy.json
ansible.builtin.template: ansible.builtin.template:
src: policy.json src: policy.json
dest: "{{ podman_containers_config }}/policy.json" dest: "/etc/containers/policy.json"
mode: 0600 mode: '755'
- name: Copy registries.json - name: Copy registries.json
ansible.builtin.template: ansible.builtin.template:
src: registries.conf src: registries.conf
dest: "{{ podman_containers_config }}/registries.conf" dest: "/etc/containers/registries.conf"
mode: 0600 mode: '755'
- name: Copy registries.json - name: Copy containers.conf
ansible.builtin.template: ansible.builtin.template:
src: containers.conf src: containers.conf
dest: "{{ podman_containers_config }}/containers.conf" dest: "{{ podman_containers_config }}/containers.conf"
mode: 0600 mode: '755'
- name: "Create registries.conf.d folder"
file:
path: "{{ podman_containers_config }}/registries.conf.d"
state: directory
mode: 'u=rwx,g=rx,o='
- name: Copy storage.conf
ansible.builtin.template:
src: storage.conf
dest: "{{ podman_containers_config }}/storage.conf"
mode: '755'
- name: Copy registries.json - name: Copy registries.json
ansible.builtin.template: ansible.builtin.template:
src: registries.conf.d/shortnames.conf src: registries.conf.d/shortnames.conf
dest: "{{ podman_containers_config }}/registries.conf.d/shortnames.conf" dest: "/etc/containers/registries.conf.d/shortnames.conf"
mode: 0600 mode: '755'
- name: set ping group range permissions
ansible.builtin.lineinfile:
path: "/etc/sysctl.d/podman_ping_group.conf"
line: "net.ipv4.ping_group_range=0 2000000"
create: true
- name: Add podman folder to $PATH - name: Add podman folder to $PATH
ansible.builtin.copy: ansible.builtin.copy:
dest: /etc/profile.d/podman.sh dest: /etc/profile.d/podman.sh
content: 'PATH=$PATH:/usr/libexec/podman' content: 'PATH=$PATH:/usr/libexec/podman'
- name: Exec lingur
shell: loginctl enable-linger 1000

View File

@ -16,7 +16,7 @@
file: file:
path: "/usr/libexec/podman" path: "/usr/libexec/podman"
state: directory state: directory
mode: 'u=rwx,g=rx,o=' mode: '755'
- name: Copy aardvark-dns file - name: Copy aardvark-dns file
ansible.builtin.copy: ansible.builtin.copy:
@ -24,4 +24,4 @@
dest: "/usr/libexec/podman/aardvark-dns" dest: "/usr/libexec/podman/aardvark-dns"
force: true force: true
remote_src: true remote_src: true
mode: +x mode: u=rx,g=rx,o=rx

View File

@ -19,7 +19,7 @@
file: file:
path: "/usr/libexec/podman" path: "/usr/libexec/podman"
state: directory state: directory
mode: 'u=rwx,g=rx,o=' mode: '755'
- name: Copy netavark file - name: Copy netavark file
ansible.builtin.copy: ansible.builtin.copy:
@ -27,4 +27,4 @@
dest: "/usr/libexec/podman/netavark" dest: "/usr/libexec/podman/netavark"
force: true force: true
remote_src: true remote_src: true
mode: +x mode: u=rx,g=rx,o=rx

View File

@ -18,8 +18,6 @@
make: make:
chdir: "{{ podman_podman_buildpath }}" chdir: "{{ podman_podman_buildpath }}"
target: install target: install
params:
PREFIX: "/usr"
- name: Setup systemd service - name: Setup systemd service
ansible.builtin.template: ansible.builtin.template:

View File

@ -4,3 +4,4 @@
- include_tasks: install.yml - include_tasks: install.yml
- include_tasks: systemd-services.yml

View File

@ -0,0 +1,14 @@
- name: Setup podman-docker service
systemd_service:
enabled: true
state: started
daemon_reload: true
name: podman-docker
- name: Setup podman.sock
remote_user: alphyron
systemd_service:
enabled: true
name: podman.sock
state: started
scope: "user"

5
templates/storage.conf Normal file
View File

@ -0,0 +1,5 @@
[storage]
driver = "overlay"
[storage.options.overlay]
mount_program = "/usr/bin/fuse-overlayfs"

View File

@ -22,6 +22,8 @@ podman_build_deps:
- libselinux1-dev - libselinux1-dev
- libapparmor-dev - libapparmor-dev
- protobuf-compiler - protobuf-compiler
- slirp4netns
- fuse-overlayfs
crun_build_deps: crun_build_deps:
- build-essential - build-essential