diff --git a/roles/uffd/templates/container/cccv-archive-key.asc b/roles/uffd/files/container/cccv-archive-key.asc similarity index 100% rename from roles/uffd/templates/container/cccv-archive-key.asc rename to roles/uffd/files/container/cccv-archive-key.asc diff --git a/roles/uffd/templates/container/entrypoint.sh b/roles/uffd/files/container/entrypoint.sh similarity index 100% rename from roles/uffd/templates/container/entrypoint.sh rename to roles/uffd/files/container/entrypoint.sh diff --git a/roles/uffd/files/container/uffd_2.3.1+git20240620T191647-5ccee36c_all.deb b/roles/uffd/files/container/uffd_2.3.1+git20240620T191647-5ccee36c_all.deb new file mode 100644 index 0000000..8192e1b Binary files /dev/null and b/roles/uffd/files/container/uffd_2.3.1+git20240620T191647-5ccee36c_all.deb differ diff --git a/roles/uffd/tasks/main.yml b/roles/uffd/tasks/main.yml index e6f618d..a2d02fe 100644 --- a/roles/uffd/tasks/main.yml +++ b/roles/uffd/tasks/main.yml @@ -15,7 +15,23 @@ state: 'directory' mode: 'u=rwx,g=rx,o=rx' -- name: 'Copy required files for image' +- name: 'Copy static files for image' + become: true + ansible.builtin.copy: + src: 'container/{{ item.file }}' + dest: '{{ uffd_build_tempdir }}/{{ item.file }}' + owner: 'root' + group: 'root' + mode: '{{ item.mode }}' + loop: + - file: 'cccv-archive-key.asc' + mode: 'u=rw,g=r,o=r' + - file: 'entrypoint.sh' + mode: 'u=rwx,g=rx,o=rx' + - file: 'uffd_2.3.1+git20240620T191647-5ccee36c_all.deb' + mode: 'u=rw,g=r,o=r' + +- name: 'Copy templates for image' become: true ansible.builtin.template: src: 'container/{{ item.file }}' @@ -26,12 +42,8 @@ loop: - file: 'cccv-archive.list' mode: 'u=rw,g=r,o=r' - - file: 'cccv-archive-key.asc' - mode: 'u=rw,g=r,o=r' - file: 'Containerfile' mode: 'u=rw,g=r,o=r' - - file: 'entrypoint.sh' - mode: 'u=rwx,g=rx,o=rx' - name: 'Create uffd container' become: true diff --git a/roles/uffd/templates/container/Containerfile b/roles/uffd/templates/container/Containerfile index 1c6af85..3bfb4a3 100644 --- a/roles/uffd/templates/container/Containerfile +++ b/roles/uffd/templates/container/Containerfile @@ -13,10 +13,11 @@ RUN apt-get -qq update && \ # Place the pacakge sources data in the image to download uffd COPY cccv-archive-key.asc /etc/apt/trusted.gpg.d/ COPY cccv-archive.list /etc/apt/sources.list.d/ +COPY uffd_2.3.1+git20240620T191647-5ccee36c_all.deb /tmp/ # Install uffd from (new) package sources RUN apt-get -qq update && \ - apt-get -qq install --no-install-recommends uffd && \ + apt-get -qq install --no-install-recommends /tmp/uffd_2.3.1+git20240620T191647-5ccee36c_all.deb && \ # Create a "new" config from the inital config without the preset secret key cat /etc/uffd/uffd.cfg | grep -v "SECRET_KEY=" > /etc/uffd/uffd.cfg.tmp && \ mv /etc/uffd/uffd.cfg.tmp /etc/uffd/uffd.cfg && \