Merge "Run containers on Noble with docker compose and podman"

playbooks/roles/install-docker/files/10-docker.conf

@@ -5,3 +5,6 @@ if $programname startswith  'docker-' then {
   ?CUSTOM_LOGS
   stop
 }
+
+# TODO(clarkb) If we tag containers with podman- we will
+# need new rules in this file.

playbooks/roles/install-docker/files/docker-compose.shim

@@ -0,0 +1,9 @@
+#!/usr/bin/bash
+
+# The quoting around $@ is important here to try and preserve original quoting
+# and pass that through to the underlying command as is. This is particularly
+# useful for our docker-compose exec mariadb commands that use a nested shell
+# to interpolate database passwords and execute sql queries or db backups.
+#
+# See "special parameters" in the bash manual for more info.
+/usr/bin/docker compose "$@"

playbooks/roles/install-docker/files/docker.socket.override.conf

@@ -0,0 +1,13 @@
+[Unit]
+Description=Docker Socket for the API
+
+[Socket]
+# Set a socket path that doesn't conflict with the default.
+# Podman will be configured to use the default path.
+ListenStream=/run/actualdocker.sock
+SocketMode=0660
+SocketUser=root
+SocketGroup=docker
+
+[Install]
+WantedBy=sockets.target

playbooks/roles/install-docker/files/podman.socket.override.conf

@@ -0,0 +1,13 @@
+[Unit]
+Description=Podman API Socket
+Documentation=man:podman-system-service(1)
+
+[Socket]
+# Set podman to listen at docker's socket location
+# to make docker compose work without environment
+# overrides.
+ListenStream=/var/run/docker.sock
+SocketMode=0660
+
+[Install]
+WantedBy=sockets.target

playbooks/roles/install-docker/tasks/Ubuntu.noble.yaml

@@ -0,0 +1,83 @@
+# We currently only install docker-compose-v2 and podman from the distro
+# on Ubuntu Noble. This also pulls in the docker runtime from the distro
+# which we're going to not use. This approach may change if the combo
+# stops working.
+
+- name: Install docker-compose-v2 and podman and friends
+  become: true
+  apt:
+    name:
+      - docker-compose-v2
+      - podman
+      - uidmap
+      - slirp4netns
+      - fuse-overlayfs
+      - containernetworking-plugins
+      # This enables container network dns resolution:
+      - golang-github-containernetworking-plugin-dnsname
+      # TODO do we need these extra tools?
+      - buildah
+      - skopeo
+    state: present
+
+- name: Disable docker daemon service
+  # docker-compose-v2 depends on the docker service. Disable it.
+  become: true
+  service:
+    name: docker
+    state: stopped
+    enabled: false
+
+- name: Disable docker socket service
+  # docker-compose-v2 depends on the docker service. Disable it.
+  become: true
+  service:
+    name: docker.socket
+    state: stopped
+    enabled: false
+
+# We add this config so that if docker starts it doesn't conflict
+# with podman. Mostly belts and suspenders here.
+- name: Add docker socket override config
+  become: true
+  copy:
+    src: docker.socket.override.conf
+    dest: /etc/systemd/system/docker.socket
+    owner: root
+    group: root
+    mode: '0644'
+
+# Configure the podman socket to pretend to be a docker socket
+- name: Add podman socket override config
+  become: true
+  copy:
+    src: podman.socket.override.conf
+    dest: /etc/systemd/system/podman.socket
+    owner: root
+    group: root
+    mode: '0644'
+  register: write_podman_sock_config
+
+- name: Reconfigure the podman services
+  # We use the podman service instead
+  become: true
+  systemd_service:
+    name: podman.socket
+    daemon_reload: true
+    state: restarted
+    enabled: true
+  when: write_podman_sock_config.changed
+
+# Currently we assume container management will be performed by root.
+# For this reason we don't do any special group management. However,
+# if this changes this is a good location to update groups and reset
+# the ansible ssh connection.
+
+- name: Add docker-compose to docker compose shim
+  become: true
+  copy:
+    src: docker-compose.shim
+    dest: /usr/local/bin/docker-compose
+    owner: root
+    group: root
+    mode: '0755'

playbooks/roles/install-docker/tasks/default.yaml

@@ -0,0 +1,59 @@
+- name: Create docker directory
+  become: yes
+  file:
+    state: directory
+    path: /etc/docker
+
+- name: Install docker-ce from upstream
+  include_tasks: upstream.yaml
+  when: use_upstream_docker|bool
+
+- name: Install docker-engine from distro
+  include_tasks: distro.yaml
+  when: not use_upstream_docker|bool
+
+- name: reset ssh connection to pick up docker group
+  meta: reset_connection
+
+# We install docker-compose from pypi to get features like
+# stop_grace_period.
+
+# On arm64 we need build-essential, python3-dev, libffi-dev, and
+# libssl-dev because wheels don't exist for all the things on arm64.
+# Similarly for Xenial while we have it, some things (cffi) have
+# stopped providing Python 3.5 wheels
+- name: Install arm64 dev pacakges
+  when: >
+      ansible_architecture == 'aarch64' or
+      ansible_distribution_release == 'xenial'
+  package:
+    name:
+      - build-essential
+      - python3-dev
+      - libffi-dev
+      - libssl-dev
+    state: present
+
+- name: Install python docker-compose if needed
+  when: with_python_compose|bool
+  block:
+  - name: ensure pip3 is installed
+    include_role:
+      name: pip3
+
+  - name: Install docker-compose
+    pip:
+      name:
+        # The explicit pin of requests is a temporary workaround to getting
+        # docker-compose functioning again after requests and urllib3 updates.
+        # Unfortunately python docker-compose is abandonware and we will need
+        # to migrate to the new docker plugin system or distro packages, but
+        # until then this is a quick workaround that will get things moving
+        # again.
+        # The explicit pin of docker is required as py docker 7.0 introduced
+        # incompatibilities with python docker-compose.
+        - requests<2.30.0
+        - docker<7.0.0
+        - docker-compose
+      state: present
+      executable: pip3

playbooks/roles/install-docker/tasks/main.yaml

@@ -1,62 +1,14 @@
-- name: Create docker directory
+# We're taking a different approach with Noble and beyond.
-  become: yes
+# For these newer releases we're going to use `docker compose`
-  file:
+# with the podman service instead of `docker-compose` with the
-    state: directory
+# docker service. We'll use task file lookups to differentiate.
-    path: /etc/docker
+# TODO(clarkb) the noble behavior really probably deservices to be
-
+# in a new role but to simplify our transition between container
-- name: Install docker-ce from upstream
+# runtimes we continue to manage it in install-docker.
-  include_tasks: upstream.yaml
+- name: Include OS-release specific tasks
-  when: use_upstream_docker|bool
+  include_tasks: "{{ lookup('first_found', file_list) }}"
-
+  vars:
-- name: Install docker-engine from distro
+    file_list: "{{ distro_lookup_path }}"
-  include_tasks: distro.yaml
-  when: not use_upstream_docker|bool
-
-- name: reset ssh connection to pick up docker group
-  meta: reset_connection
-
-# We install docker-compose from pypi to get features like
-# stop_grace_period.
-
-# On arm64 we need build-essential, python3-dev, libffi-dev, and
-# libssl-dev because wheels don't exist for all the things on arm64.
-# Similarly for Xenial while we have it, some things (cffi) have
-# stopped providing Python 3.5 wheels
-- name: Install arm64 dev pacakges
-  when: >
-      ansible_architecture == 'aarch64' or
-      ansible_distribution_release == 'xenial'
-  package:
-    name:
-      - build-essential
-      - python3-dev
-      - libffi-dev
-      - libssl-dev
-    state: present
-
-- name: Install python docker-compose if needed
-  when: with_python_compose|bool
-  block:
-  - name: ensure pip3 is installed
-    include_role:
-      name: pip3
-
-  - name: Install docker-compose
-    pip:
-      name:
-        # The explicit pin of requests is a temporary workaround to getting
-        # docker-compose functioning again after requests and urllib3 updates.
-        # Unfortunately python docker-compose is abandonware and we will need
-        # to migrate to the new docker plugin system or distro packages, but
-        # until then this is a quick workaround that will get things moving
-        # again.
-        # The explicit pin of docker is required as py docker 7.0 introduced
-        # incompatibilities with python docker-compose.
-        - requests<2.30.0
-        - docker<7.0.0
-        - docker-compose
-      state: present
-      executable: pip3
 
 - name: Install rsyslog redirector for container tags
   copy:
@@ -79,7 +31,7 @@
     group: adm
     mode: 0775
 
-- name: Install log rotation for docker files
+- name: Install log rotation for container log files
   include_role:
     name: logrotate
   vars: