From 07d6de7eb44c215b90dbe8596a2ee1d7559b7cef Mon Sep 17 00:00:00 2001 From: Kohei Watanabe Date: Mon, 30 May 2022 22:12:19 +0900 Subject: [PATCH] use compose v2 --- bin/build | 6 +++--- docker-compose.yml => compose.yml | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) rename docker-compose.yml => compose.yml (98%) diff --git a/bin/build b/bin/build index 1f1be1e..2fc1bbe 100755 --- a/bin/build +++ b/bin/build @@ -1,7 +1,7 @@ #!/bin/sh # ビルド # Usage: bin/build -# Required: docker-compose +# Required: docker compose cd -- "$(dirname -- "$0")/.." set -eux version="$(bin/version)" @@ -9,10 +9,10 @@ bin/import "${version}" ghcr.io/kou029w/yama/minirootfs rm -rf dist mkdir dist bin/download "${version}" dist -docker-compose run --rm minirootfs sh -c 'apk update && apk add' +docker compose run --rm minirootfs sh -c 'apk update && apk add' ssh-keygen -A -f apkovl cp -a usercfg.txt cache -t dist gzip -cdk overlay.img.gz > dist/overlay.img -docker-compose run --rm builder +docker compose run --rm builder tar czf dist/localhost.apkovl.tar.gz --owner=0 --group=0 -C apkovl . tar czf yama-armhf.tar.gz --owner=0 --group=0 -C dist . diff --git a/docker-compose.yml b/compose.yml similarity index 98% rename from docker-compose.yml rename to compose.yml index 449b09f..adbe6de 100644 --- a/docker-compose.yml +++ b/compose.yml @@ -1,4 +1,3 @@ -version: "3" services: minirootfs: image: ghcr.io/kou029w/yama/minirootfs