docker: Prepare Dockerfile for multi-arch images (voiceip#107)

zmoon460 · Jun 29, 2022 · 7e0bd14 · 7e0bd14
1 parent 2c76120
commit 7e0bd14
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -18,6 +18,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
         with:
@@ -44,11 +45,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-docker-
       - name: Build Docker Image for ubuntu
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          # platforms: linux/amd64,linux/arm64
           context: ./distribution/docker/
           file: ./distribution/docker/Dockerfile.orkaudio
           cache-from: type=local,src=/tmp/.buildx-cache

diff --git a/distribution/docker/Dockerfile.orkaudio b/distribution/docker/Dockerfile.orkaudio
@@ -9,10 +9,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y gnupg ca-certificates && rm -rf /var/lib/apt/lists/* 
 
-RUN . /etc/os-release && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 31F54F3E108EAD31 `
-	&& echo "deb [trusted=yes] https://ppa.launchpadcontent.net/mhier/libboost-latest/ubuntu $UBUNTU_CODENAME main" >> /etc/apt/sources.list
-
-RUN apt-get update && apt-get install -y build-essential libtool automake git tree rpm libboost1.70-dev`
+RUN apt-get update && apt-get install -y build-essential libtool automake git tree rpm libboost-all-dev`
 	libpcap-dev libsndfile1-dev libapr1-dev libspeex-dev liblog4cxx-dev libace-dev libcap-dev `
 	libopus-dev libxerces-c3-dev libssl-dev cmake libdw-dev liblzma-dev libunwind-dev`
 	&& rm -rf /var/lib/apt/lists/* 
@@ -39,7 +36,7 @@ RUN mkdir -p /opt/opus && chmod 777 /opt/opus`
 RUN mkdir -p /opt/bcg729 && chmod 777 /opt/bcg729`
 	&& git clone --depth 1 https://github.com/BelledonneCommunications/bcg729.git /opt/bcg729 `
 	&& cd /opt/bcg729 `
-	&& cmake . -DCMAKE_INSTALL_PREFIX=/usr`
+	&& cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib`
 	&& make `
 	&& make install
 
@@ -77,7 +74,7 @@ RUN --mount=type=bind,source=/,target=/artifacts,from=builder `
    	&& cp /artifacts/opt/oreka/orkaudio/audiocaptureplugins/generator/.libs/libgenerator.so* /usr/lib/`
    	&& cp /artifacts/opt/oreka/orkaudio/audiocaptureplugins/generator/.libs/libgenerator.la /usr/lib/`
    	&& cp /artifacts/usr/lib/liborkbase.*  /usr/lib/ `
-   	&& cp /artifacts/usr/lib/x86_64-linux-gnu/libbcg729.*  /usr/lib/ `
+   	&& cp /artifacts/usr/lib/libbcg729.*  /usr/lib/ `
    	&& mkdir -p /usr/lib/orkaudio/plugins/ `
    	&& cp /artifacts/opt/oreka/orkaudio/plugins/*.so  /usr/lib/orkaudio/plugins/