ci: docker update env

pulp-platform · Feb 16, 2023 · f1074a0 · f1074a0
1 parent 7efac83
commit f1074a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/.github/Dockerfile b/.github/Dockerfile
@@ -35,8 +35,9 @@ RUN mkdir -p /tools/slang && chmod 777 /tools/slang && \
 # install rust
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
+ENV RUSTUP_HOME=/usr/local/rustup CARGO_HOME=/usr/local/cargo PATH="${PATH}:/usr/local/cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 # install morty via cargo
-RUN . "$HOME/.cargo/env" && cargo install --git https://github.com/pulp-platform/morty.git
+RUN cargo install --git https://github.com/pulp-platform/morty.git
 
 # install python dependencies
 COPY .github/requirements.txt .

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -56,9 +56,6 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: pulpplatform/cheshire-ci:latest
-    defaults:
-      run:
-        shell: bash -el {0}
     steps:
       -
         name: Checkout
@@ -80,9 +77,6 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: pulpplatform/cheshire-ci:latest
-    defaults:
-      run:
-        shell: bash -el {0}
     steps:
       -
         name: Checkout