From d52051529de4a14aaca2fc5695f67dd3c3e3b82b Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 15 Jul 2024 18:59:33 +0200 Subject: [PATCH] ff --- Dockerfile | 11 +++-------- requirements.yaml | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 8 deletions(-) create mode 100644 requirements.yaml diff --git a/Dockerfile b/Dockerfile index c14d6d4..0269b88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,18 +4,12 @@ ENV DEBIAN_FRONTEND=noninteractive WORKDIR / COPY requirements.txt . - -# hadolint ignore=DL3008,DL3028 -RUN apt-get update \ - && apt-get -y --no-install-recommends install wget \ - && rm -rf /var/lib/apt/lists/* /var/tmp/* /tmp/* \ - && apt-get clean +COPY requirements.yaml . RUN python3 -m pip install --upgrade pip \ && python3 -m pip install --no-cache-dir -r requirements.txt -RUN wget -q https://git.mgrote.net/mg/homeserver/raw/branch/master/requirements.yaml \ - && ansible-galaxy install -r requirements.yaml --force +RUN ansible-galaxy install -r requirements.yaml --force RUN apt-get update \ && apt-get -y --no-install-recommends install \ @@ -27,6 +21,7 @@ RUN apt-get update \ mc \ ca-certificates \ tree \ + wget \ curl \ whois \ net-tools \ diff --git a/requirements.yaml b/requirements.yaml new file mode 100644 index 0000000..2f4b9f7 --- /dev/null +++ b/requirements.yaml @@ -0,0 +1,42 @@ +collections: + - name: community.general + version: "9.2.0" + - name: community.crypto + version: "2.21.0" + - name: ansible.posix + version: "1.5.4" + - name: community.docker + version: "3.11.0" + - name: viczem.keepass + version: "0.7.5" +roles: + - name: ansible-role-bootstrap + src: git+https://git.mgrote.net/ansible-role-mirrors/ansible-role-bootstrap + version: "7.0.2" + - name: ansible-ufw + src: git+https://git.mgrote.net/ansible-role-mirrors/ansible-ufw + version: "v4.1.13" + - name: ansible-manage-lvm + src: git+https://git.mgrote.net/ansible-role-mirrors/ansible-manage-lvm + version: "v0.2.11" + - name: ansible-role-unattended-upgrades + src: git+https://git.mgrote.net/ansible-role-mirrors/ansible-role-unattended-upgrades + version: "v4.6.0" + - name: ansible-role-pip + src: git+https://git.mgrote.net/ansible-role-mirrors/ansible-role-pip + version: "3.0.3" + - name: ansible-role-nfs + src: git+https://git.mgrote.net/ansible-role-mirrors/ansible-role-nfs + version: "2.0.0" + - name: ansible-role-docker + src: git+https://git.mgrote.net/ansible-role-mirrors/ansible-role-docker + version: "7.1.0" + - name: ansible_role_ctop + src: git+https://git.mgrote.net/ansible-role-mirrors/ansible_role_ctop + version: "1.1.6" + - name: ansible_role_gitea + src: git+https://git.mgrote.net/ansible-role-mirrors/ansible_role_gitea + version: "v3.4.4" + - name: ansible-role-postgresql + src: git+https://git.mgrote.net/ansible-role-mirrors/ansible-role-postgresql + version: "3.5.2"