From 64da6306cc26a97f003f5e5c90472fdc269f0cbd Mon Sep 17 00:00:00 2001 From: Madelen Andersson Date: Tue, 24 Oct 2023 13:46:41 +0200 Subject: [PATCH] remove unneeded files Change-Id: I0025d8f1f6035fa4626787c8cffa586f06a2bf52 --- Makefile.dockerd | 25 ------------------------- build.sh | 6 +++--- docker-bake.override.hcl | 6 ------ 3 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 Makefile.dockerd delete mode 100644 docker-bake.override.hcl diff --git a/Makefile.dockerd b/Makefile.dockerd deleted file mode 100644 index 7575b25..0000000 --- a/Makefile.dockerd +++ /dev/null @@ -1,25 +0,0 @@ -include DOCKERVERSION - -ifeq ($(ARCH),aarch64) - DOCKER_CROSSPLATFORMS = linux\/arm64 -else ifeq ($(ARCH),armv7hf) - DOCKER_CROSSPLATFORMS = linux\/arm\/v7 -else - $(error No support yet for ARCH "$(ARCH)") -endif - -all: dockerd - -moby-$(DOCKERVERSION): - curl -L https://github.com/moby/moby/archive/refs/tags/v$(DOCKERVERSION).tar.gz | tar xz && \ - mv docker-bake.override.hcl moby-$(DOCKERVERSION)/ && \ - sed -i 's/linux\/arm\/v7/$(DOCKER_CROSSPLATFORMS)/g' moby-$(DOCKERVERSION)/docker-bake.override.hcl - -moby-$(DOCKERVERSION)/bundles/binary/dockerd: moby-$(DOCKERVERSION) - make -C moby-$(DOCKERVERSION) cross - -dockerd: moby-$(DOCKERVERSION)/bundles/binary/dockerd - cp -L moby-$(DOCKERVERSION)/bundles/binary/$@ . - -clean: - rm -f dockerd moby-$(DOCKERVERSION) diff --git a/build.sh b/build.sh index 942e739..e8d5464 100755 --- a/build.sh +++ b/build.sh @@ -1,10 +1,10 @@ -#!/bin/sh -case "$1" in +#!/bin/sh -eu +case "${1:-}" in armv7hf|aarch64) ;; *) # error - echo "Invalid argument '$1', valid arguments are armv7hf or aarch64" + echo "Invalid argument '${1:-}', valid arguments are armv7hf or aarch64" exit 1 ;; esac diff --git a/docker-bake.override.hcl b/docker-bake.override.hcl deleted file mode 100644 index 05c2ca1..0000000 --- a/docker-bake.override.hcl +++ /dev/null @@ -1,6 +0,0 @@ -target "binary-cross" { - inherits = ["binary", "_platforms"] - platforms = [ - "linux/arm/v7" - ] -}