From 8db733dee8e65e1ee0634a1192787228a01bf5e9 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 2 Oct 2021 11:42:21 +0200 Subject: [PATCH] tweaks to the artifacts Makefile --- docker/librewolf/debian/deb/Makefile | 6 ++++-- docker/librewolf/fedora/rpm/Makefile | 6 ++++-- docker/librewolf/mint/deb/Makefile | 6 ++++-- docker/librewolf/ubuntu/deb/Makefile | 8 ++++++-- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/docker/librewolf/debian/deb/Makefile b/docker/librewolf/debian/deb/Makefile index 5451db0..e119df7 100644 --- a/docker/librewolf/debian/deb/Makefile +++ b/docker/librewolf/debian/deb/Makefile @@ -10,10 +10,12 @@ no-cache : sudo docker build --no-cache -t librewolf/$(docker_stage) . make get_zip -get_zip : artifacts/librewolf-92.0.1.en-US.deb.zip +get_zip : artifacts/librewolf-92.0.1.en-US.debian.zip -artifacts/librewolf-92.0.1.en-US.deb.zip : +artifacts/librewolf-92.0.1.en-US.debian.zip : sudo docker create --name extract0 librewolf/$(docker_stage) sudo rm -rf artifacts sudo docker cp extract0:/artifacts . sudo docker rm extract0 + sudo mv -v artifacts/librewolf-92.0.1.en-US.deb.zip artifacts/librewolf-92.0.1.en-US.debian.zip + sudo chown user:user artifacts/librewolf-92.0.1.en-US.debian.zip diff --git a/docker/librewolf/fedora/rpm/Makefile b/docker/librewolf/fedora/rpm/Makefile index a4a921d..cc99d89 100644 --- a/docker/librewolf/fedora/rpm/Makefile +++ b/docker/librewolf/fedora/rpm/Makefile @@ -14,10 +14,12 @@ no-cache : sudo docker build --no-cache -t librewolf/$(docker_stage) . make get_zip -get_zip : artifacts/librewolf-92.0.1.en-US.deb.zip +get_zip : artifacts/librewolf-92.0.1.en-US.fedora.zip -artifacts/librewolf-92.0.1.en-US.deb.zip : +artifacts/librewolf-92.0.1.en-US.fedora.zip : sudo docker create --name extract1 librewolf/$(docker_stage) sudo rm -rf artifacts sudo docker cp extract1:/artifacts . sudo docker rm extract1 + sudo mv -v artifacts/librewolf-92.0.1.en-US.deb.zip artifacts/librewolf-92.0.1.en-US.fedora.zip + sudo chown user:user artifacts/librewolf-92.0.1.en-US.fedora.zip diff --git a/docker/librewolf/mint/deb/Makefile b/docker/librewolf/mint/deb/Makefile index ccc57ff..0269074 100644 --- a/docker/librewolf/mint/deb/Makefile +++ b/docker/librewolf/mint/deb/Makefile @@ -10,10 +10,12 @@ no-cache : sudo docker build --no-cache -t librewolf/$(docker_stage) . make get_zip -get_zip : artifacts/librewolf-92.0.1.en-US.deb.zip +get_zip : artifacts/librewolf-92.0.1.en-US.mint.zip -artifacts/librewolf-92.0.1.en-US.deb.zip : +artifacts/librewolf-92.0.1.en-US.mint.zip : sudo docker create --name extract2 librewolf/$(docker_stage) sudo rm -rf artifacts sudo docker cp extract2:/artifacts . sudo docker rm extract2 + sudo mv -v artifacts/librewolf-92.0.1.en-US.deb.zip artifacts/librewolf-92.0.1.en-US.mint.zip + sudo chown user:user artifacts/librewolf-92.0.1.en-US.mint.zip diff --git a/docker/librewolf/ubuntu/deb/Makefile b/docker/librewolf/ubuntu/deb/Makefile index 001d0dd..1b8514c 100644 --- a/docker/librewolf/ubuntu/deb/Makefile +++ b/docker/librewolf/ubuntu/deb/Makefile @@ -10,10 +10,14 @@ no-cache : sudo docker build --no-cache -t librewolf/$(docker_stage) . make get_zip -get_zip : artifacts/librewolf-92.0.1.en-US.deb.zip +get_zip : artifacts/librewolf-92.0.1.en-US.ubuntu.zip -artifacts/librewolf-92.0.1.en-US.deb.zip : + + +artifacts/librewolf-92.0.1.en-US.ubuntu.zip : sudo docker create --name extract3 librewolf/$(docker_stage) sudo rm -rf artifacts sudo docker cp extract3:/artifacts . sudo docker rm extract3 + sudo mv -v artifacts/librewolf-92.0.1.en-US.deb.zip artifacts/librewolf-92.0.1.en-US.ubuntu.zip + sudo chown user:user artifacts/librewolf-92.0.1.en-US.ubuntu.zip