From a0112a80b9f38eb4642afd03ae296144b1a19430 Mon Sep 17 00:00:00 2001
From: 0xfourzerofour <joshpauline@gmail.com>
Date: Wed, 25 Oct 2023 16:16:00 -0400
Subject: [PATCH] chore(docker): remove cross script

---
 .github/workflows/docker-release.yaml | 2 +-
 Cross.toml                            | 1 -
 Makefile                              | 2 +-
 cross.sh                              | 5 -----
 4 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100755 cross.sh

diff --git a/.github/workflows/docker-release.yaml b/.github/workflows/docker-release.yaml
index 5c67e3cf2..2a9e28529 100644
--- a/.github/workflows/docker-release.yaml
+++ b/.github/workflows/docker-release.yaml
@@ -47,4 +47,4 @@ jobs:
       - name: Build and push image
         run: |
           cargo install cross
-          env PROFILE=release make docker-build-latest
+          export PROFILE=release && make docker-build-latest
diff --git a/Cross.toml b/Cross.toml
index 96d5bae27..869cd4b65 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,6 +1,5 @@
 [build]
 pre-build = [
-	"git config --global --add safe.directory '*'",
 	"curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && echo 'deb https://dl.yarnpkg.com/debian/ stable main' | tee /etc/apt/sources.list.d/yarn.list",
 	"mkdir -p /etc/apt/keyrings",
 	"curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg",
diff --git a/Makefile b/Makefile
index 6490d4526..459dc5df4 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ test-spec-modular: ## Run spec tests in modular mode
 # Note: The additional rustc compiler flags are for intrinsics needed by MDBX.
 # See: https://github.com/cross-rs/cross/wiki/FAQ#undefined-reference-with-build-std
 build-%:
-	./cross.sh build --bin rundler --target $* --profile "$(PROFILE)"
+	cross build --bin rundler --target $* --profile "$(PROFILE)"
 	
 # Note: This requires a buildx builder with emulation support. For example:
 .PHONY: docker-build-latest
diff --git a/cross.sh b/cross.sh
deleted file mode 100755
index 7b4e060bf..000000000
--- a/cross.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-export CARGO_BUILD_TARGET="${TARGET}"
-export CARGO_TARGET_DIR=target/build/"${CARGO_BUILD_TARGET}"
-cross "${@}"
\ No newline at end of file