Add separate file for aur task & add rootless docker tasks

This commit is contained in:
Sonny Bakker 2021-11-28 12:04:41 +01:00
parent 4c35875333
commit cede4ea365
8 changed files with 67 additions and 16 deletions

View file

@ -22,5 +22,6 @@
- import_tasks: 'tasks/dotfiles.yml' - import_tasks: 'tasks/dotfiles.yml'
- import_tasks: 'tasks/neovim.yml' - import_tasks: 'tasks/neovim.yml'
- import_tasks: 'tasks/aur.yml' - import_tasks: 'tasks/aur.yml'
- import_tasks: 'tasks/docker.yml'
vars_files: vars_files:
- 'vars.yml' - 'vars.yml'

22
tasks/aur-package.yml Normal file
View file

@ -0,0 +1,22 @@
- name: build package
command: 'makepkg --syncdeps --rmdeps --clean --noconfirm --force'
args:
chdir: '{{ aur_build_dir }}/{{ item.name }}'
- name: retrieve package name
command: 'grep -oP "(?<=pkgname=).*" {{ aur_build_dir }}/{{ item.name }}/PKGBUILD'
register: pkg_name
- name: retrieve package version
command: 'grep -oP "(?<=pkgver=).*" {{ aur_build_dir }}/{{ item.name }}/PKGBUILD'
register: pkg_version
- name: retrieve package release
command: 'grep -oP "(?<=pkgrel=).*" {{ aur_build_dir }}/{{ item.name }}/PKGBUILD'
register: pkg_release
- name: install package
become: true
pacman:
name: '{{ aur_build_dir }}/{{ item.name }}/{{ pkg_name.stdout }}-{{ pkg_version.stdout }}-{{ pkg_release.stdout }}-x86_64.pkg.tar.zst'
state: present

View file

@ -9,15 +9,21 @@
- name: change aur package directories owner - name: change aur package directories owner
become: true become: true
file: file:
path: '{[ aur_build_dir }}/{{ item.name }}' path: '{{ aur_build_dir }}/{{ item.name }}'
state: directory state: directory
owner: sonny owner: '{{ ansible_user_id }}'
group: sonny group: '{{ ansible_user_id }}'
recurse: true recurse: true
loop: '{{ aur_packages }}' loop: '{{ aur_packages }}'
- name: build packages - name: build & install aur packages
command: 'makepkg --syncdeps --rmdeps --clean' include_tasks: 'tasks/aur-package.yml'
args:
chdir: '{[ aur_build_dir }}/{{ item.name }}'
loop: '{{ aur_packages }}' loop: '{{ aur_packages }}'
- name: enable docker socket
systemd:
name: docker.socket
state: restarted
enabled: true
scope: user
daemon_reload: true

28
tasks/docker.yml Normal file
View file

@ -0,0 +1,28 @@
- name: copy docker mapping files
become: true
template:
src: '{{ item.src }}'
dest: '{{ item.dest }}'
loop:
- {
src: 'templates/subgid.j2',
dest: '/etc/subgid',
}
- {
src: 'templates/subuid.j2',
dest: '/etc/subuid',
}
- name: ensure correct DOCKER_HOST is set
lineinfile:
path: '{{ ansible_env.HOME }}/.bashrc'
regexp: '^export DOCKER_HOST='
line: 'export DOCKER_HOST=unix:///run/user/{{ ansible_user_uid }}/docker.sock'
- name: enable docker socket
systemd:
name: docker.socket
state: restarted
enabled: true
scope: user
daemon_reload: true

View file

@ -11,15 +11,6 @@
update: true update: true
version: master version: master
- name: remove old docker packages
become: true
package:
name: '{{ item }}'
state: absent
loop:
- docker
- docker-compose
- name: copy konsole configuration files - name: copy konsole configuration files
template: template:
src: '{{ item.src }}' src: '{{ item.src }}'

1
templates/subgid.j2 Normal file
View file

@ -0,0 +1 @@
{{ ansible_user_id }}:231072:65536

1
templates/subuid.j2 Normal file
View file

@ -0,0 +1 @@
{{ ansible_user_id }}:231072:65536

View file

@ -11,6 +11,7 @@ packages:
- npm - npm
- docker - docker
- docker-compose - docker-compose
- fuse-overlayfs
- ttf-ibm-plex - ttf-ibm-plex
aur_packages: aur_packages: