Fixed defaults for docker user

galaxy.yml

@@ -1,7 +1,7 @@
 ---
 namespace: serversideup
 name: spin
-version: 1.3.0
+version: 1.3.1
 readme: README.md
 authors:
   - Jay Rogers (https://x.com/jaydrogers)

molecule/default/vars.yml

@@ -47,8 +47,5 @@ additional_users:
 
 docker_user:
   username: dockeruser
-  uid: 8888
-  group: dockergroup
-  secondary_groups: "docker"
-  gid: 8888
-  home: "/opt/docker"
+  authorized_keys:
+      - public_key: "ssh-ed25519 AAAAC3NzaC1anotherfakekeyIMVIzwQXBzxxD9b8Erd1FKVvu dockeruser"

molecule/default/verify.yml

@@ -44,7 +44,6 @@
         that:
           - docker_user_test.name == docker_user.username
           - docker_user_test.changed == false
-          - docker_user_test.uid == docker_user.uid
         fail_msg: "Failed to assert the Docker user exists."
 
     - name: Get Docker & Docker Swarm info.

roles/swarm/tasks/configure-docker-user.yml

@@ -1,20 +1,20 @@
 - name: Ensure the Docker user's group exists with the correct GID.
   ansible.builtin.group:
-    name: "{{ docker_user.group }}"
-    gid: "{{ docker_user.gid }}"
+    name: "{{ docker_user.group | default('deploy') }}"
+    gid: "{{ docker_user.gid | default('9999') }}"
     state: present
 
 - name: Ensure the Docker user is created.
   ansible.builtin.user:
     name: "{{ docker_user.username }}"
     create_home: yes
-    group: "{{ docker_user.group }}"
-    groups: "{{ docker_user.secondary_groups }}"
+    group: "{{ docker_user.group | default('deploy') }}"
+    groups: "{{ docker_user.secondary_groups | default('docker') }}"
     home: "{{ docker_user.home | default(omit) }}"
     shell: /bin/bash
     state: present
     system: no
-    uid: "{{ docker_user.uid }}"
+    uid: "{{ docker_user.uid | default('9999') }}"
 
 - name: Set the authorized SSH keys for the Docker user.
   ansible.posix.authorized_key:
@@ -30,4 +30,4 @@
     state: present
     key: "{{ item.authorized_keys.0.public_key }}"
   loop: "{{ users }}"
-  when: "'adm' in item.groups or 'sudo' in item.groups"
+  when: "'sudo' in item.groups"