From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6960199746776465408 X-Received: by 2002:a2e:751d:: with SMTP id q29mr15505724ljc.198.1620547787547; Sun, 09 May 2021 01:09:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1025:: with SMTP id w5ls2386662ljm.0.gmail; Sun, 09 May 2021 01:09:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvUgVtj3o7ZZC2CDF+RB3NqNQQNTt7dKdnI04ZTAMBiaQzmYyxV8yYgr8kPxbMW7yLzyZI X-Received: by 2002:a2e:b4c3:: with SMTP id r3mr15322757ljm.232.1620547786543; Sun, 09 May 2021 01:09:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620547786; cv=none; d=google.com; s=arc-20160816; b=bENrd3jzBWUMgAWcGtbWtU9QBwP84TO2QTmNh+6dpQOLJ12pZPTjoDMX9eHmYw4g91 LNit66QsYg+zYP0OwohshPNan8Rtbn7pc7vyKGr3YExYLccMU1bYpRoehkzDMHngNph0 xEDOT70gSFtyqz6krIPkm7PUIAfU2da7XKpyurMZJizPQtq+nPDw5tvBtCcSq3/cwvFi gw1s66pt/7oaOHlNNX+/V6539l93iv1RvypbKES78PeTvFALwxANUU1oNBtFInMw4Xck CtBheKi47hbNFpMK0ccOijSwmt8yShuCs7UaLRlJ3gAIRbsOu8+30K7Y/lfrqi7Ogq7h HY8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:cc:to:subject:from; bh=qpy7hzxC9XGq1Yr1DZWn8beQG+dEskms0Gb32b8qLuE=; b=ho6jS4kdVCIyYl/BsHwcPOAB6danMrV9r1SPPB0k5Gh2Uwsm2B3BWI4ArfVlS4o5JB HCnkS27U0IdQFGdT6EHheUfIbDpM3E0+A07bMlujeyED2ynXooYMPZFHAsHYOerjzTao 2oKGcRuVrsaWQdxU/v6BSUBpTDZBkAlom5UmuuUbab6GveGRLnz5T7PGei+P5K+GsQj7 sz5icx3YGNs6cgnni0bFCOTWcGNXcy2hTUG/HGQoZbS8A4YXGq0ib8gzkE9VlVQ8baTA knM0lG3H03dj/oualG/U8pkNGzVhX81cMcpM3+j9jSz12FIdGe4EtzwSc2l5kbmu+l47 WmGw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id i14si298579ljg.7.2021.05.09.01.09.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 May 2021 01:09:46 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 14989jJv019653 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 9 May 2021 10:09:45 +0200 Received: from [167.87.1.6] ([167.87.1.6]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 14982Q61018079; Sun, 9 May 2021 10:02:26 +0200 From: Jan Kiszka Subject: [PATCH] doc: Fix and simplify container image loading description To: isar-users Cc: "Cirujano-Cuesta, Silvano" Message-ID: Date: Sun, 9 May 2021 10:02:26 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: wmhH2UgwLdfM From: Jan Kiszka The manual was incorrectly referencing 'docker import', rather than what was also used in the example: only 'docker load' works for the generated images. And the proposed command line can be simplified by passing the image directly to 'docker load'. Signed-off-by: Jan Kiszka --- doc/user_manual.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/user_manual.md b/doc/user_manual.md index 2749ef0..2f7df87 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -258,7 +258,7 @@ Container images can be generated in different formats, selected with the variable `CONTAINER_FORMAT`. One or more (whitespace separated) of following options can be given: - `docker-archive`: (default) an archive containing a Docker image that can - be imported with [`docker import`](https://docs.docker.com/engine/reference/commandline/import/) + be imported with [`docker load`](https://docs.docker.com/engine/reference/commandline/load) - `docker-daemon`: resulting container image is made available on the local Docker Daemon - `containers-storage`: resulting container image is made available to tools @@ -300,7 +300,7 @@ bitbake mc:qemuarm-buster:isar-image-base - Load the container image into the Docker Daemon ``` -xzcat build/tmp/deploy/images/qemuarm/debian-buster-armhf-docker-archive.tar.xz | docker load +docker load -i build/tmp/deploy/images/qemuarm/debian-buster-armhf-docker-archive.tar.xz ``` - Run a container using the container image (following commands starting with @@ -1019,7 +1019,7 @@ Supported formats are: "[Create an ISAR SDK root filesystem](#create-an-isar-sdk-root-filesystem)" - `docker-archive`: an archive containing a Docker image that can be imported with - [`docker import`](https://docs.docker.com/engine/reference/commandline/import/) + [`docker load`](https://docs.docker.com/engine/reference/commandline/load) - `docker-daemon`: resulting container image is made available on the local Docker Daemon - `containers-storage`: resulting container image is made available to tools @@ -1071,7 +1071,7 @@ bitbake -c do_populate_sdk mc:qemuarm-buster:isar-image-base - Load the SDK container image into the Docker Daemon ``` -xzcat build/tmp/deploy/images/qemuarm/sdk-debian-buster-armhf-docker-archive.tar.xz | docker load +docker load -i build/tmp/deploy/images/qemuarm/sdk-debian-buster-armhf-docker-archive.tar.xz ``` - Run a container using the SDK container image (following commands starting -- 2.26.2