diff options
Diffstat (limited to 'molecule/default')
| -rw-r--r-- | molecule/default/Dockerfile.j2 | 16 | ||||
| -rw-r--r-- | molecule/default/converge.yml | 11 | ||||
| -rw-r--r-- | molecule/default/molecule.yml | 14 |
3 files changed, 7 insertions, 34 deletions
diff --git a/molecule/default/Dockerfile.j2 b/molecule/default/Dockerfile.j2 deleted file mode 100644 index cc459e3..0000000 --- a/molecule/default/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -FROM {{ item.image }} - -# Install dependencies. -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - sudo wget \ - python3-pip python3-dev python3-setuptools python3-wheel python3-apt \ - sed ssh openssh-server \ - systemd systemd-sysv dbus dbus-user-session \ - && rm -rf /var/lib/apt/lists/* \ - && rm -Rf /usr/share/doc && rm -Rf /usr/share/man \ - && apt-get clean - -RUN mkdir /run/sshd - -ENTRYPOINT ["/sbin/init"] diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 504758d..90b3258 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -47,17 +47,6 @@ | split(" ") | reject("search", borg_server_host) | join(" ") }} - when: borg_server_host_ssh_key is not defined - -- name: Setup - Create custom borg user on borg-server-2 - hosts: borg-server-2 - tasks: - - name: Create backupserver user - ansible.builtin.user: - name: backupserver - home: /var/backups - shell: /bin/bash - become: true - name: Converge - Default borg-client hosts: borg-client diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 7b8a349..0ea5c96 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -8,7 +8,7 @@ driver: platforms: - name: borg-client image: ${MOLECULE_DISTRO_CLIENT:-debian:12} - dockerfile: Dockerfile.j2 + dockerfile: ../Dockerfile.j2 pre_build_image: false privileged: true docker_networks: @@ -21,7 +21,7 @@ platforms: - name: borg-client-2 image: ${MOLECULE_DISTRO_CLIENT:-debian:12} - dockerfile: Dockerfile.j2 + dockerfile: ../Dockerfile.j2 pre_build_image: false privileged: true networks: @@ -29,7 +29,7 @@ platforms: - name: borg-client-multi image: ${MOLECULE_DISTRO_CLIENT:-debian:12} - dockerfile: Dockerfile.j2 + dockerfile: ../Dockerfile.j2 pre_build_image: false privileged: true networks: @@ -37,7 +37,7 @@ platforms: - name: borg-client-nonroot image: ${MOLECULE_DISTRO_CLIENT:-debian:12} - dockerfile: Dockerfile.j2 + dockerfile: ../Dockerfile.j2 pre_build_image: false privileged: true networks: @@ -45,7 +45,7 @@ platforms: - name: borg-client-multi-keys image: ${MOLECULE_DISTRO_CLIENT:-debian:12} - dockerfile: Dockerfile.j2 + dockerfile: ../Dockerfile.j2 pre_build_image: false privileged: true networks: @@ -53,7 +53,7 @@ platforms: - name: borg-server image: ${MOLECULE_DISTRO_SERVER:-debian:12} - dockerfile: Dockerfile.j2 + dockerfile: ../Dockerfile.j2 pre_build_image: false privileged: true networks: @@ -61,7 +61,7 @@ platforms: - name: borg-server-2 image: ${MOLECULE_DISTRO_SERVER:-debian:12} - dockerfile: Dockerfile.j2 + dockerfile: ../Dockerfile.j2 pre_build_image: false privileged: true networks: |