From 160bc518322212a3e4db56533cf475f283d63f78 Mon Sep 17 00:00:00 2001 From: Marc Ahlgrim Date: Sun, 18 Sep 2022 15:37:32 +0200 Subject: [PATCH] bugfixes Signed-off-by: Marc Ahlgrim --- ansible-rundeck-docker/Dockerfile | 13 +++++++++++-- examples/playbooks/deploy-ansible.yaml | 5 ++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ansible-rundeck-docker/Dockerfile b/ansible-rundeck-docker/Dockerfile index bbd2fff..b1b94dd 100644 --- a/ansible-rundeck-docker/Dockerfile +++ b/ansible-rundeck-docker/Dockerfile @@ -14,14 +14,23 @@ RUN apt-get -y update && \ wget \ curl \ git \ - nmap + nmap \ + sshpass +# let's install ansible using pip as root +# this will give a fat red warning at runtime but is intended this way. RUN pip install --upgrade pip RUN pip install ansible +# we download the debian package for vscode server from the coder github repo +# and install it with apt RUN wget https://github.com/coder/code-server/releases/download/v4.6.0/code-server_4.6.0_amd64.deb RUN apt -y install ./code-server_4.6.0_amd64.deb +# for compatibility with the non-docker version we just link the +# /var/lib/rundeck directory to the /home/rundeck directory +RUN ln -s /home/rundeck /var/lib/rundeck + USER rundeck # now make sure the vscode server gets started at runtime @@ -32,7 +41,7 @@ RUN chmod 755 docker-lib/includes/120_vscode.sh # make sure we can write to the ansible volume RUN echo 'sudo chown rundeck:root ansible' >docker-lib/includes/110_volume.sh RUN echo '/bin/touch ~/ansible/ansible.cfg' >>docker-lib/includes/110_volume.sh -RUN if [ ! -e ~/.ansible.cfg ] ; then ln -s ~/ansible/ansible.cfg ~.ansible.cfg ; fi +RUN if [ ! -e ~/.ansible.cfg ] ; then ln -s ~/ansible/ansible.cfg ~/.ansible.cfg ; fi RUN chmod 755 docker-lib/includes/110_volume.sh #VOLUME ["/home/rundeck/server/data"] diff --git a/examples/playbooks/deploy-ansible.yaml b/examples/playbooks/deploy-ansible.yaml index 9b8e66e..835d742 100644 --- a/examples/playbooks/deploy-ansible.yaml +++ b/examples/playbooks/deploy-ansible.yaml @@ -53,9 +53,12 @@ dest: "/etc/sudoers.d/ansiblessh" content: "ansiblessh ALL=(ALL) NOPASSWD: ALL" +# now we deploy the ssh key. For this we just copy the id_rsa.pub file +# to the host + - name: Deploy SSH Key authorized_key: user=ansiblessh - key="{{ lookup('id_rsa', '/var/lib/rundeck/.ssh') }}" + key="{{ lookup('file', '/var/lib/rundeck/.ssh/id_rsa.pub') }}" state=present \ No newline at end of file