Fixes: arm crossbuild commandline err, env-file, readme

Signed-off-by: Terekhin Alexandr <alex@bearns.me>
debug
Terekhin Alexandr 4 years ago
parent bc6e5a5c55
commit 1ab28107a1
  1. 4
      Dockerfile
  2. 9
      README.md
  3. 2
      build.sh

@ -5,12 +5,12 @@ RUN apk add --no-cache openssl-dev linux-headers zlib-dev gcc gperf cmake build-
&& mkdir build \ && mkdir build \
&& cd build \ && cd build \
&& cmake -DCMAKE_BUILD_TYPE=Release .. \ && 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 \ && apk del linux-headers gcc gperf cmake build-base git \
&& rm -r ./telegram-bot-api && rm -r ./telegram-bot-api
RUN adduser --no-create-home --uid 2000 --disabled-password tg-bot \ RUN adduser --no-create-home --uid 2000 --disabled-password tg-bot \
&& mkdir -p /opt/telegram-bot-api \ && 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_ID=""
ENV TELEGRAM_API_HASH="" ENV TELEGRAM_API_HASH=""

@ -16,7 +16,7 @@ Put it into `tg-bot-api.env` file variables.
Just run `./build.sh` script Just run `./build.sh` script
Or build manualy: `docker build -t <you image name> .` Or build manualy: `docker build -t <you image name> .`
And run it: And run it:
`docker run -p <host port>:8081 --name <you container name> --env=./tg-bot-api.env <you image name>` `docker run -p <host port>:8081 --name <you container name> --env-file=./tg-bot-api.env <you image name>`
## Crossbuild ## Crossbuild
@ -49,5 +49,8 @@ default docker
Set used by default Set used by default
`docker buildx use <gallant_mahavira>` `docker buildx use <gallant_mahavira>`
Run crossbuild Run crossbuild & export image to tar file
`docker buildx build -t <you image name> --platform linux/arm/v7 .` `docker buildx build -o "type=docker,dest=image.docker.tar" -t <you image name> --platform linux/arm/v7 .`
Import crossbuilded image into target host
`docker image load -i image.docker.tar`

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
docker build -t bearns.me/tg-api . docker build -t bearns.me/tg-api .
docker container rm 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

Loading…
Cancel
Save