From 1ab28107a186957282d61eae5cb4fa11ee1b21ee Mon Sep 17 00:00:00 2001 From: Terekhin Alexandr Date: Sun, 28 Mar 2021 12:10:21 +0300 Subject: [PATCH] Fixes: arm crossbuild commandline err, env-file, readme Signed-off-by: Terekhin Alexandr --- Dockerfile | 4 ++-- README.md | 9 ++++++--- build.sh | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0368c23..02bd233 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,12 +5,12 @@ RUN apk add --no-cache openssl-dev linux-headers zlib-dev gcc gperf cmake build- && mkdir build \ && cd build \ && cmake -DCMAKE_BUILD_TYPE=Release .. \ - && cmake --build . --target install \ + && cmake --build . -j 4 --target install \ && apk del linux-headers gcc gperf cmake build-base git \ && rm -r ./telegram-bot-api RUN adduser --no-create-home --uid 2000 --disabled-password tg-bot \ && mkdir -p /opt/telegram-bot-api \ - && chown tg-bot:tg-bot /opt/telegram-bot-api + && chown tg-bot /opt/telegram-bot-api ENV TELEGRAM_API_ID="" ENV TELEGRAM_API_HASH="" diff --git a/README.md b/README.md index b47a686..69b5824 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Put it into `tg-bot-api.env` file variables. Just run `./build.sh` script Or build manualy: `docker build -t .` And run it: - `docker run -p :8081 --name --env=./tg-bot-api.env ` + `docker run -p :8081 --name --env-file=./tg-bot-api.env ` ## Crossbuild @@ -49,5 +49,8 @@ default docker Set used by default `docker buildx use ` -Run crossbuild -`docker buildx build -t --platform linux/arm/v7 .` \ No newline at end of file +Run crossbuild & export image to tar file +`docker buildx build -o "type=docker,dest=image.docker.tar" -t --platform linux/arm/v7 .` + +Import crossbuilded image into target host +`docker image load -i image.docker.tar` \ No newline at end of file diff --git a/build.sh b/build.sh index ebd897e..a3c0c08 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ #!/bin/bash docker build -t bearns.me/tg-api . docker container rm tg-api -docker run --name tg-api --env=./tg-bot-api.env -p 8081:8081 bearns.me/tg-api +docker run --name tg-api --env-file=./tg-bot-api.env -p 8081:8081 bearns.me/tg-api