Skip to content

Commit 4e5536c

Browse files
more docker fixes (#405)
1 parent 22a0028 commit 4e5536c

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,3 +146,10 @@ nf-openproblems
146146

147147
# Editor
148148
.idea
149+
150+
# snakemake
151+
.docker_build
152+
.docker_pull
153+
.docker_refresh
154+
.docker_update
155+
.docker_push

workflow/Snakefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ rule refresh_docker_image:
3131
dockerfile = "{}/{{image}}/refresh.Dockerfile".format(tools.IMAGES_DIR),
3232
requirements = tools.docker_refresh_requirements,
3333
output:
34-
temp(touch("{}/{{image}}/.docker_refresh".format(tools.IMAGES_DIR)))
34+
touch("{}/{{image}}/.docker_refresh".format(tools.IMAGES_DIR))
3535
params:
3636
sourcedir = os.path.dirname(tools.SCRIPTS_DIR),
3737
user = "singlecellopenproblems",
@@ -67,14 +67,14 @@ rule update_docker_image:
6767
input:
6868
tools.docker_update_requirements
6969
output:
70-
temp(touch("{}/{{image}}/.docker_update".format(tools.IMAGES_DIR)))
70+
touch("{}/{{image}}/.docker_update".format(tools.IMAGES_DIR))
7171

7272
rule build_docker_image:
7373
input:
7474
dockerfile = "{}/{{image}}/Dockerfile".format(tools.IMAGES_DIR),
7575
requirements = tools.docker_build_requirements,
7676
output:
77-
temp(touch("{}/{{image}}/.docker_build".format(tools.IMAGES_DIR)))
77+
touch("{}/{{image}}/.docker_build".format(tools.IMAGES_DIR))
7878
params:
7979
sourcedir = os.path.dirname(tools.SCRIPTS_DIR),
8080
user = "singlecellopenproblems",
@@ -102,13 +102,13 @@ rule push_docker_image:
102102
build = "{}/{{image}}/.docker_update".format(tools.IMAGES_DIR),
103103
login = ".docker_login",
104104
output:
105-
temp(touch("{}/{{image}}/.docker_push".format(tools.IMAGES_DIR)))
105+
touch("{}/{{image}}/.docker_push".format(tools.IMAGES_DIR))
106106
shell:
107107
"docker push --quiet singlecellopenproblems/{wildcards.image}"
108108

109109
rule pull_docker_image:
110110
output:
111-
temp(touch("{}/{{image}}/.docker_pull".format(tools.IMAGES_DIR)))
111+
touch("{}/{{image}}/.docker_pull".format(tools.IMAGES_DIR))
112112
shell:
113113
"DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect singlecellopenproblems/{wildcards.image} > /dev/null && \
114114
docker pull --quiet singlecellopenproblems/{wildcards.image} || true"

0 commit comments

Comments
 (0)