diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 0fecf14..c6e675e 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -24,7 +24,7 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v2 - name: Download opencv - run: sudo apt install libopencv-dev ffmpeg -y + run: sudo apt install libavcodec-dev libavformat-dev libswscale-dev libopencv-dev ffmpeg -y - name: Get dependencies run: cd machinery && go mod download - name: Build diff --git a/Dockerfile b/Dockerfile index b100927..9486276 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,8 +72,13 @@ RUN ldd /agent/main | tr -s '[:blank:]' '\n' | grep '^/' | \ RUN mkdir -p ./usr/lib -RUN [ -f /lib64/ld-linux-x86-64.so.2 ] && $(mkdir -p lib64 && cp /lib64/ld-linux-x86-64.so.2 lib64/) || echo "nothing to do here x86" -RUN [ -f /lib/ld-linux-aarch64.so.1 ] && $(mkdir -p lib/aarch64-linux-gnu && cp /lib/ld-linux-aarch64.so.1 lib/ && cp /lib/aarch64-linux-gnu/* lib/aarch64-linux-gnu/ && cp /usr/lib/aarch64-linux-gnu/libopencv* ./usr/lib ) || echo "nothing to do here arm64" +RUN [ -f /lib64/ld-linux-x86-64.so.2 ] && $(mkdir -p lib64 && \ + cp /lib64/ld-linux-x86-64.so.2 lib64/) || echo "nothing to do here x86" + +RUN [ -f /lib/ld-linux-aarch64.so.1 ] && $(mkdir -p lib/aarch64-linux-gnu && \ + cp /lib/ld-linux-aarch64.so.1 lib/ && \ + cp /lib/aarch64-linux-gnu/lib* lib/aarch64-linux-gnu/ && \ + cp /usr/lib/aarch64-linux-gnu/libopencv* usr/lib ) || echo "nothing to do here arm64" RUN cp -r /usr/local/lib/libavcodec* ./usr/lib && \ cp -r /usr/local/lib/libavformat* ./usr/lib && \