Skip to content

Commit 4991716

Browse files
committed
docker: do not invalidate the system container when changing reference
1 parent d8dd2c2 commit 4991716

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

docker-build

+2-2
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def main():
183183
targets_env="--env=targets={}".format(" ".join(common_target_list))
184184

185185
# Install Debian and dependencies.
186-
docker.run("build", ["unvanquished-common-system", targets_arg, reference_arg])
186+
docker.run("build", ["unvanquished-common-system", targets_arg])
187187

188188
# Clone source repositories and build external dependencies.
189189
docker.run("build", ["unvanquished-common-source", targets_arg, reference_arg])
@@ -202,7 +202,7 @@ def main():
202202
stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
203203

204204
# Install Ubuntu, Darling, Xcode and other dependencies.
205-
docker.run("build", ["unvanquished-darling-system", targets_arg, reference_arg])
205+
docker.run("build", ["unvanquished-darling-system", targets_arg])
206206

207207
after, err = docker.run("inspect", inspect_system_command_list,
208208
stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)

docker/unvanquished-common-system.Dockerfile

-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ RUN test -n "${targets}"
1111
COPY docker/install-system-dependencies /docker
1212
RUN /docker/install-system-dependencies
1313

14-
ARG reference
15-
RUN test -n "${reference}"
16-
1714
COPY docker/clone-repositories /docker
1815

1916
COPY docker/build-external-dependencies /docker

docker/unvanquished-darling-system.Dockerfile

-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ RUN test -n "${targets}"
1111
COPY docker/install-system-dependencies /docker
1212
RUN /docker/install-system-dependencies
1313

14-
ARG reference
15-
RUN test -n "${reference}"
16-
1714
COPY docker/clone-repositories /docker
1815

1916
COPY docker/build-targets /docker

0 commit comments

Comments
 (0)