From 674182257772a0b2250e1755b9f58a4c13944cd5 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 9 Dec 2024 11:37:25 +0000 Subject: [PATCH] chore: revert previous change --- transport-interop/impl/js/v2.x/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/transport-interop/impl/js/v2.x/Makefile b/transport-interop/impl/js/v2.x/Makefile index 32b7c5c4c..9e9b2d480 100644 --- a/transport-interop/impl/js/v2.x/Makefile +++ b/transport-interop/impl/js/v2.x/Makefile @@ -1,19 +1,19 @@ image_name := js-v2.x # TODO Enable webkit once https://github.com/libp2p/js-libp2p/pull/1627 is in -all: clean image.json chromium-image.json firefox-image.json update-lock-file +all: image.json chromium-image.json firefox-image.json update-lock-file # Necessary because multistage builds require a docker image name rather than a digest to be used load-image-json: image.json docker image tag $$(jq -r .imageID image.json) ${image_name} chromium-image.json: load-image-json BrowserDockerfile - docker build --no-cache --progress=plain -f BrowserDockerfile --build-arg=BASE_IMAGE=${image_name} --build-arg=BROWSER=chromium -t chromium-${image_name} . + docker build -f BrowserDockerfile --build-arg=BASE_IMAGE=${image_name} --build-arg=BROWSER=chromium -t chromium-${image_name} . docker image inspect chromium-${image_name} -f "{{.Id}}" | \ xargs -I {} echo "{\"imageID\": \"{}\"}" > $@ firefox-image.json: load-image-json BrowserDockerfile - docker build --no-cache --progress=plain -f BrowserDockerfile --build-arg=BASE_IMAGE=${image_name} --build-arg=BROWSER=firefox -t firefox-${image_name} . + docker build -f BrowserDockerfile --build-arg=BASE_IMAGE=${image_name} --build-arg=BROWSER=firefox -t firefox-${image_name} . docker image inspect firefox-${image_name} -f "{{.Id}}" | \ xargs -I {} echo "{\"imageID\": \"{}\"}" > $@ @@ -25,8 +25,7 @@ update-lock-file: image.json docker rm $$CONTAINER_ID image.json: - echo $(CURDIR) - docker build --no-cache --progress=plain -t ${image_name} -f ./Dockerfile . + docker build -t ${image_name} -f ./Dockerfile . docker image inspect ${image_name} -f "{{.Id}}" | \ xargs -I {} echo "{\"imageID\": \"{}\"}" > $@