From 2b98f72f2f97ab318762b79e81f7be0cff64ae98 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Thu, 15 Jul 2021 16:26:21 +0200 Subject: [PATCH] CI: Update .drone.yml #1158 #1432 Move scripts/install-qemu.sh from Makefile to .drone.yml --- .drone.yml | 4 +++- Makefile | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8919fdc6f..76a902559 100644 --- a/.drone.yml +++ b/.drone.yml @@ -61,6 +61,7 @@ steps: from_secret: docker_password commands: - scripts/docker-login.sh + - scripts/install-qemu.sh - make docker-preview when: status: @@ -93,6 +94,7 @@ steps: from_secret: docker_password commands: - scripts/docker-login.sh + - scripts/install-qemu.sh - make docker-release when: status: @@ -175,6 +177,6 @@ steps: --- kind: signature -hmac: 547daa345cfdc4fb73547df7d39231c958b99f507c03b529f4ba1974688b47f8 +hmac: 8ecc944cb21da49afb764eef74a4cd1a385e36ca43b7b0710773b42534d3f83f ... diff --git a/Makefile b/Makefile index ea40f491a..1dce8dac9 100644 --- a/Makefile +++ b/Makefile @@ -165,16 +165,14 @@ clean: rm -rf storage/cache rm -rf frontend/node_modules docker-development: + scripts/install-qemu.sh docker pull --platform=amd64 ubuntu:21.04 docker pull --platform=arm64 ubuntu:21.04 docker pull --platform=arm ubuntu:21.04 - scripts/install-qemu.sh scripts/docker-buildx.sh development linux/amd64,linux/arm64,linux/arm $(DOCKER_TAG) docker-preview: - scripts/install-qemu.sh scripts/docker-buildx.sh photoprism linux/amd64,linux/arm64,linux/arm docker-release: - scripts/install-qemu.sh scripts/docker-buildx.sh photoprism linux/amd64,linux/arm64,linux/arm $(DOCKER_TAG) docker-local: scripts/docker-build.sh photoprism