From 4fa98c48e090b38c844bc27d7421947085d3dda9 Mon Sep 17 00:00:00 2001
From: Eugene Pankov <e@ajenti.org>
Date: Wed, 18 May 2022 00:53:55 -0700
Subject: [PATCH] .

---
 .github/workflows/build.yml | 25 +++++++++++++++----------
 docker/Dockerfile.builder   |  2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 903a7c2..26a6cd4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,15 +5,16 @@ on: [push, pull_request]
 jobs:
   Build:
     runs-on: ubuntu-latest
-    container: eugenepankov/warpgate-build-env
     steps:
       - uses: actions/checkout@v2
 
       - uses: rlespinasse/github-slug-action@4.2.3
 
-      - name: Install Rust
-        run: |
-          curl https://sh.rustup.rs -sSf | sh -s -- -y
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          target: x86_64-unknown-linux-gnu
+          override: true
 
       - name: Cache
         uses: actions/cache@v2
@@ -26,20 +27,24 @@ jobs:
 
       - name: Install just
         run: |
-          ~/.cargo/bin/cargo install just
+          cargo install just
 
       - name: Install admin UI deps
         run: |
-          ~/.cargo/bin/just yarn
+          just yarn
 
       - name: Build admin UI
         run: |
-          ~/.cargo/bin/just yarn openapi-client
-          ~/.cargo/bin/just yarn build
+          just yarn openapi-client
+          just yarn build
 
       - name: Build
-        run: |
-          ~/.cargo/bin/cargo build --release
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          toolchain: nightly
+          use-cross: true
+          args: --release --target x86_64-unknown-linux-gnu -Ztarget-applies-to-host
 
       - name: Rename
         run: |
diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index 6491d82..620fded 100644
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -1,7 +1,7 @@
 FROM centos/devtoolset-7-toolchain-centos7
 USER root
 RUN curl -fsSL https://rpm.nodesource.com/setup_16.x | bash -
-RUN yum install -y nodejs java pkgconfig openssl-devel && yum clean all
+RUN yum install -y nodejs java pkgconfig openssl-devel perl-IPC-Cmd && yum clean all
 RUN npm i -g yarn
 USER 1001
 ENV PATH=/opt/app-root/src/.cargo/bin:/opt/rh/devtoolset-7/root/usr/bin:/opt/app-root/src/bin:/opt/app-root/bin:/opt/rh/devtoolset-7/root/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin