revert: addition of docker.sock mount

gamersoutreach · Feb 20, 2024 · a5afa79 · a5afa79
1 parent 7093b6e
commit a5afa79
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -19,9 +19,8 @@ RUN set -eux; \
 # Create ansible user with explicit uid
 RUN <<EOF
     set -eux
-    groupadd -r docker --gid=999
     groupadd -r ansible --gid=1000
-    useradd -m -u 1000 -g 1000 -G 999 ansible
+    useradd -m -u 1000 -g 1000 ansible
     mkdir -p /home/ansible/.ssh
     chown -R ansible:ansible /home/ansible
 EOF
@@ -47,7 +46,6 @@ EOF
 
 VOLUME /app
 VOLUME /home/ansible/.ssh
-VOLUME /var/run/docker.sock
 WORKDIR /app
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["/bin/bash"]
diff --git a/README.md b/README.md
@@ -10,7 +10,6 @@ This project builds a docker image with all of the dependencies required to run
 | -------------------- | ------- | -------------------------------------- |
 | `PUID`               | `1000`  | User ID of the primary ansible user    |
 | `PGID`               | `1000`  | Group ID for the priamry ansible group |
-| `DOCKERGID`          | `999`   | Group ID for the docker group          |
 
 ### Users
 
@@ -20,11 +19,10 @@ This project builds a docker image with all of the dependencies required to run
 
 ### Mounts
 
-| Mount                  | Description                                                                                                                              |
-| ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- |
-| `/app`                 | The expected mount path for an ansible project                                                                                           |
-| `/home/ansible/.ssh`   | The default ansible user's SSH Directory. Private keys can be mounted inside of this directory for use by ansible-playbook during runs.  |
-| `/var/run/docker.sock` | This container supports access to the host's docker daemon for testing purposes. Optionally mount the docker socket if you require this. |
+| Mount                | Description                                                                                                                             |
+| -------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
+| `/app`               | The expected mount path for an ansible project                                                                                          |
+| `/home/ansible/.ssh` | The default ansible user's SSH Directory. Private keys can be mounted inside of this directory for use by ansible-playbook during runs. |
 
 ## Usage
 
@@ -37,7 +35,6 @@ docker run \
     --network host \
     -e PUID=${id -u} \
     -e PGID=${id -g} \
-    -e DOCKERGID=${getent group docker | cut -d ':' -f 3} \
     --mount type=bind,source=".",target=/app \
     --mount type=bind,source="${HOME}/.ssh",target=/home/ansible/.ssh,readonly \
     ghcr.io/gamersoutreach/ansible-runner:latest \

diff --git a/overlay/docker-entrypoint.sh b/overlay/docker-entrypoint.sh
@@ -3,15 +3,11 @@ set -e
 
 PUID="${PUID:-1000}"
 PGID="${PGID:-1000}"
-DOCKERGID="${DOCKERGID:-999}"
 
 # Set UID/GID of ansible user
 sed -i "s/^ansible\:x\:1000\:1000/ansible\:x\:$PUID\:$PGID/" /etc/passwd
 sed -i "s/^ansible\:x\:1000/ansible\:x\:$PGID/" /etc/group
 
-# Set the GID of the docker group
-sed -i "s/^docker\:x\:999/docker\:x\:$DOCKERGID/" /etc/group
-
 # Set permissions on home folder, excluding .ssh mount
 chown $PUID:$PGID /home/ansible
 find /home/ansible -mindepth 1 -maxdepth 1 -not -name ".ssh" -exec chown -R $PUID:$PGID {} \;