Changes so this can be deployed from M1/ARM platforms

main
Ashelyn Dawn 4 months ago
parent 368b019c11
commit 905b006dc6
No known key found for this signature in database
GPG Key ID: D1980B8C6F349BC1

@ -5,6 +5,7 @@ run rm /etc/nix/nix.conf
run mv /etc/nix/nix.conf.nolink /etc/nix/nix.conf
run echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf
run echo "filter-syscalls = false" >> /etc/nix/nix.conf
run nix-env -iA nixpkgs.deploy-rs

@ -5,7 +5,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
cd $SCRIPT_DIR/..
echo "Building Nix environment in docker"
IMAGE=$(docker build . -q -f ./deploy/Dockerfile)
IMAGE=$(docker build . -q -f ./deploy/Dockerfile --platform linux/amd64)
echo "Beginning deploy"
docker run \
@ -13,6 +13,7 @@ docker run \
--rm \
--mount type=bind,src=$(pwd)/deploy/.ssh/,dst=/root/.ssh/,readonly=true \
--mount type=volume,src=nixCache,dst=/nix/ \
--platform linux/amd64 \
-it $IMAGE \
deploy

@ -5,7 +5,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
cd $SCRIPT_DIR/..
echo "Building Nix environment in docker"
IMAGE=$(docker build . -q -f ./deploy/Dockerfile)
IMAGE=$(docker build . -q -f ./deploy/Dockerfile --platform linux/amd64)
echo "Starting interactive shell"
docker run \
@ -14,6 +14,7 @@ docker run \
--mount type=bind,src=$(pwd)/,dst=/deploy/ \
--mount type=bind,src=$(pwd)/deploy/.ssh/,dst=/root/.ssh/,readonly=true \
--mount type=volume,src=nixCache,dst=/nix/ \
--platform linux/arm64 \
-it $IMAGE \
bash

@ -486,11 +486,11 @@
"utils": "utils_6"
},
"locked": {
"lastModified": 1704084384,
"narHash": "sha256-x5lFO36g7R3bZD9ABusAYgW87/VFSTijb8XeKM824Pk=",
"lastModified": 1704816317,
"narHash": "sha256-4I9kIK5Is1fu6KgKanaziXusCNLpYqovVxpP1WJ/W8c=",
"ref": "refs/heads/main",
"rev": "dbe4156b8fceb4fe64d280769f34dc0fdf8a41e0",
"revCount": 19,
"rev": "02ff12eae2d158edfd2ff1e773856b86b34558d6",
"revCount": 20,
"type": "git",
"url": "ssh://git@git.tempest.dev/ashe/nixos-config-private"
},

Loading…
Cancel
Save