From 629e66a57c9657fe234b974016bd90fba7a0ba1b Mon Sep 17 00:00:00 2001 From: SinTan1729 Date: Mon, 25 Mar 2024 01:22:54 -0500 Subject: [PATCH] docs: Updated build instructions --- Makefile | 2 +- README.md | 10 ++++++++-- docker_push_script.sh | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7b56ab2..c9a0555 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -USERNAME := ${USERNAME} +USERNAME := ${DOCKER_USERNAME} setup: cargo install cross diff --git a/README.md b/README.md index 993442f..b70e5a6 100644 --- a/README.md +++ b/README.md @@ -75,10 +75,16 @@ place, resulting in possibly unwanted behavior. ## Building and running with docker ### `docker run` method -0. (Only if you really want to) Build the image +0. (Only if you really want to) Build the image for the default `x86_64-unknown-linux-musl` target: ``` -docker build . -t chhoto-url:latest +docker build . -t chhoto-url ``` +For building on `arm64` or `arm/v7`, use the following: +``` +docker build . -t chhoto-url --build-arg target= +``` +For cross-compilation, take a look at the `Makefile`. It builds and pushes for `linux/amd64`, `linux/aarch64` +and `linux/arm/v7` architectures. For any other architectures, open a discussion, and I'll try to help you out. 1. Run the image ``` docker run -p 4567:4567 diff --git a/docker_push_script.sh b/docker_push_script.sh index e5d7eba..3e95cd2 100755 --- a/docker_push_script.sh +++ b/docker_push_script.sh @@ -1,7 +1,7 @@ #!/bin/env bash if [ "$1" == "dev" ]; then - docker buildx build --push --tag sintan1729/$name:dev --platform linux/amd64 + docker buildx build --push --tag sintan1729/$name:dev . elif [ "$1" == "release" ]; then v_patch=$(cat actix/Cargo.toml | sed -rn 's/^version = "(.+)"$/\1/p')