Fixes for 254db77 and 2c3e3f8.

Signed-off-by: Tao He <linzhu.ht@alibaba-inc.com>
sighingnow · Jun 2, 2021 · 777aad8 · 777aad8
1 parent 254db77
commit 777aad8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/build-vineyardd-and-wheels-linux.yaml b/.github/workflows/build-vineyardd-and-wheels-linux.yaml
@@ -46,7 +46,7 @@ jobs:
       - name: Build vineyardd on Linux
         run: |
           sudo docker build . -f docker/Dockerfile.vineyardd -t docker.pkg.github.com/v6d-io/v6d/vineyardd:alpine-${{ github.sha }}
-          sudo docker run --rm -v `pwd`:/target docker.pkg.github.com/v6d-io/v6d/vineyardd:alpine-${{ github.sha }} sh -c "cp /usr/bin/local/vineyardd /target/"
+          sudo docker run --rm -v `pwd`:/target docker.pkg.github.com/v6d-io/v6d/vineyardd:alpine-${{ github.sha }} sh -c "cp /usr/local/bin/vineyardd /target/"
           ldd ./vineyardd
 
       - name: Package vineyardd artifact on Linux

diff --git a/docker/Dockerfile.vineyardd b/docker/Dockerfile.vineyardd
@@ -59,7 +59,7 @@ RUN apk add --no-cache bash
 COPY --from=builder /tmp/dumb-init_1.2.2_amd64 /usr/bin/dumb-init
 COPY --from=builder /tmp/wait-for-it.sh /usr/bin/wait-for-it.sh
 COPY --from=builder /tmp/etcd-v3.4.13-linux-amd64/etcd /usr/bin/etcd
-COPY --from=builder /work/libvineyard/build/bin/vineyardd /usr/bin/local/vineyardd
+COPY --from=builder /work/libvineyard/build/bin/vineyardd /usr/local/bin/vineyardd
 
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 CMD ["/usr/local/bin/vineyardd"]