cleanup, requisite files instead of startupscripts

This commit is contained in:
2021-06-18 12:02:53 +02:00
parent 4450c9bb65
commit 02e87d7c40
3 changed files with 26 additions and 37 deletions

View File

@@ -1,35 +1,29 @@
- copy:
- name: create directories for docker image build
file:
path: "/container/docker-images/slurm-{{image.name}}/{{item}}"
state: directory
owner: "{{unpriv_user}}"
group: docker
loop: "{{ [''] + (image.files | map(attribute='dest') | map('dirname') |
unique | select | list) }}"
- name: copy Dockerfile
copy:
src: "{{image.name}}.Dockerfile"
dest: "/container/docker-images/slurm/{{image.name}}.Dockerfile"
dest: "/container/docker-images/slurm-{{image.name}}/Dockerfile"
owner: "{{unpriv_user}}"
group: docker
register: slurm_cp_dockerfile
# TODO: single source of truth:
# dockerfile -> parse for startup files or startup files template in dockerfile
- name: copy startup scripts
- name: copy requisite files
copy:
contents: "{{ item.content | default(lookup('file', item.name)) }}"
dest: "/container/docker-images/slurm/start-scripts/{{item.name}}"
content: "{{ item.content }}"
dest: "/container/docker-images/slurm-{{image.name}}/{{item.dest}}"
owner: root
group: root
mode: u=rwx,g=rx,o=rx
loop: "{{ start_scripts | default([]) }}"
register: slurm_cp_stscrs
- set_fact:
slurm_stscrs_changed: "{{ (slurm_stscrs_changed | default([])) +
(slurm_cp_stscrs.results | selectattr('changed') |
map(attribute='item.name') | list) }}"
- set_fact:
slurm_stscrs_relevant: "{{ slurm_stscrs_changed |
intersect(start_scripts | default([]) | map(attribute='name') | list) |
length > 0 }}"
- debug: msg="{{slurm_cp_dockerfile.changed or
slurm_stscrs_relevant or
slurm_baseimg_build_chg }}"
loop: "{{ image.files | default([]) }}"
register: slurm_cp_files
- docker_image:
name: "slurm"
@@ -37,11 +31,8 @@
# pull: False
build:
pull: False
path: "/container/docker-images/slurm/"
dockerfile: "{{image.name}}.Dockerfile"
# target: "{{image.name}}" # unsupported on old docker-py version as in el7
path: "/container/docker-images/slurm-{{image.name}}/"
source: build
force_source: "{{slurm_cp_dockerfile.changed or
slurm_stscrs_relevant or
slurm_cp_files.changed or
slurm_baseimg_build_chg }}"
# TODO: force when base image changed!