From 70b8cd3c55425d29d3605d096c1cc0920acb5bde Mon Sep 17 00:00:00 2001 From: kieran Date: Thu, 30 Jan 2025 12:15:07 +0000 Subject: [PATCH] fix: docker build --- .dockerignore | 3 +++ .drone.yml | 2 +- crates/zap-stream/.dockerignore | 3 --- crates/zap-stream/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 .dockerignore delete mode 100644 crates/zap-stream/.dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..224a94a --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +**/target/ +**/.git/ +**/out/ \ No newline at end of file diff --git a/.drone.yml b/.drone.yml index 50b58b2..d49808e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,6 +19,6 @@ steps: - docker login -u kieran -p $TOKEN git.v0l.io - docker login -u voidic -p $DOCKER_TOKEN - docker buildx create --name mybuilder --bootstrap --use - - docker buildx build --push --platform linux/amd64 -t git.v0l.io/kieran/zap-stream-core:latest -t voidic/zap-stream-core:latest . + - docker buildx build --push --platform linux/amd64 -t git.v0l.io/kieran/zap-stream-core:latest -t voidic/zap-stream-core:latest -f ./crates/zap-stream/Dockerfile . - kill $(cat /var/run/docker.pid) diff --git a/crates/zap-stream/.dockerignore b/crates/zap-stream/.dockerignore deleted file mode 100644 index 5624211..0000000 --- a/crates/zap-stream/.dockerignore +++ /dev/null @@ -1,3 +0,0 @@ -target/ -.git/ -out/ \ No newline at end of file diff --git a/crates/zap-stream/Dockerfile b/crates/zap-stream/Dockerfile index c8c50aa..a7852a9 100755 --- a/crates/zap-stream/Dockerfile +++ b/crates/zap-stream/Dockerfile @@ -31,7 +31,7 @@ RUN git clone --single-branch --branch release/7.1 https://git.ffmpeg.org/ffmpeg --disable-static \ --enable-shared && \ make -j$(nproc) && make install -RUN cargo install --path . --bin zap-stream-core --root /app/build --features zap-stream +RUN cargo install --path ./crates/zap-stream --root /app/build FROM $IMAGE AS runner WORKDIR /app