Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
Change-Id: Ic78654fe77132a0138e628637bec4d8bc8952fe9
  • Loading branch information
madelen-at-work committed Jun 19, 2023
1 parent d7bf786 commit 0b4ca54
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#!/bin/sh -e
case "$1" in
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

dockerdtag=dockerd:1.0
imagetag="${2:-docker-acap-with-compose:1.0}"
imagetag=${2:--docker-acap-with-compose:1.0}
dockerdname=dockerd_name

# First we build and copy out dockerd
Expand All @@ -19,7 +19,6 @@ docker buildx build --build-arg ACAPARCH="$1" \
--build-arg HTTPS_PROXY="$HTTPS_PROXY" \
--tag $dockerdtag \
--no-cache \
--progress=plain \
--file Dockerfile.dockerd .

docker run -v /var/run/docker.sock:/var/run/docker.sock \
Expand All @@ -39,7 +38,6 @@ docker buildx build --build-arg ACAPARCH="$1" \
--build-arg HTTPS_PROXY="$HTTPS_PROXY" \
--file Dockerfile.acap \
--no-cache \
--progress=plain \
--tag "$imagetag" .

docker cp "$(docker create "$imagetag")":/opt/app/ ./build-"$1"

0 comments on commit 0b4ca54

Please sign in to comment.