Merge pull request keshavdv#300 from bdsoha/feature/cargo-cli

🛠 Cargo fetching from CLI, closes keshavdv#299
drewtenn · Apr 19, 2023 · df5de7c · df5de7c
2 parents 6a1e42d + a686a9d
commit df5de7c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,6 +1,5 @@
 ARG VARIANT="3.9"
-FROM mcr.microsoft.com/vscode/devcontainers/python:dev-${VARIANT}-buster
-
+FROM mcr.microsoft.com/vscode/devcontainers/universal
 WORKDIR /app
 
 RUN apt-get update && apt-get install -y ffmpeg netcat-openbsd

diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
@@ -29,9 +29,9 @@ jobs:
             TAGS="$TAGS,${DOCKER_IMAGE}:latest"
           fi
 
-          echo version=${VERSION} >> $GITHUB_OUTPUT
-          echo tags=${TAGS} >> $GITHUB_OUTPUT
-          echo created=$(date -u +'%Y-%m-%dT%H:%M:%SZ') >> $GITHUB_OUTPUT
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          echo "tags=${TAGS}" >> $GITHUB_OUTPUT
+          echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
 
       -
         name: Set up QEMU

diff --git a/Dockerfile b/Dockerfile
@@ -3,8 +3,20 @@ ARG tag=${version}-alpine3.17
 
 FROM python:${tag} as builder
 WORKDIR /app
-
-RUN apk add --update gcc g++ musl-dev rust cargo patchelf libc-dev linux-headers zlib-dev jpeg-dev
+ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
+
+RUN apk add --update \
+        cargo \
+        git \
+        gcc \
+        g++ \
+        jpeg-dev \
+        libc-dev \
+        linux-headers \
+        musl-dev \
+        patchelf \
+        rust \
+        zlib-dev
 
 RUN pip install -U pip wheel setuptools maturin
 COPY requirements.txt .
@@ -16,7 +28,10 @@ WORKDIR /app
 
 ARG version
 
-COPY --from=builder /usr/local/lib/python${version}/site-packages /usr/local/lib/python${version}/site-packages
+COPY --from=builder \
+        /usr/local/lib/python${version}/site-packages \
+        /usr/local/lib/python${version}/site-packages
+
 RUN apk add --update ffmpeg netcat-openbsd libusb-dev
 
 COPY . .