Skip to content

Commit 1dbaec3

Browse files
committed
remove pigz
1 parent f8f3637 commit 1dbaec3

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

src/job/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ RUN apk add --no-cache \
1313
bash \
1414
libc6-compat \
1515
openssh-client \
16-
git \
17-
pigz && \
16+
git && \
1817
pip install docker==2.0.1 awscli && \
1918
pip install docker-compose==1.20.1 future PyJWT && \
2019
apk del py-pip && \

src/job/job.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,20 @@ def flush(self):
131131
self.console.flush()
132132

133133
def compress(self, source, output):
134-
subprocess.check_call("tar cf - --directory %s . | pigz -n > %s" % (source, output), shell=True)
134+
try:
135+
subprocess.check_call("tar cf %s ." % output, cwd=source)
136+
except subprocess.CalledProcessError as e:
137+
self.console.collect(e.output)
138+
raise
135139

136140
def uncompress(self, source, output, c):
137-
cmd = "pigz -dc %s | tar x -C %s" % (source, output)
138-
c.collect(cmd, show=True)
139-
subprocess.check_call(cmd, shell=True)
141+
try:
142+
cmd = "tar xf %s" % source
143+
c.collect(cmd, show=True)
144+
subprocess.check_call(cmd, cwd=output)
145+
except subprocess.CalledProcessError as e:
146+
self.console.collect(e.output)
147+
raise
140148

141149
def get_files_in_dir(self, d, ending=None):
142150
result = []

0 commit comments

Comments
 (0)