diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c518fd06..fed7cfe3 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -12,7 +12,7 @@ env: jobs: docker: - name: build (Ubuntu ${{matrix.ubuntu}}, OpenCV ${{matrix.opencv}}, ${{matrix.compiler.label}}) + name: build (Ubuntu ${{matrix.ubuntu}}, OpenCV ${{matrix.opencv}}) runs-on: ubuntu-latest permissions: @@ -24,9 +24,6 @@ jobs: matrix: ubuntu: ['20.04', '22.04'] opencv: ['4.x'] - compiler: - - { cmd: 'g++', label: 'gcc' } - - { cmd: 'clang', label: 'clang' } steps: - name: Check out main project @@ -50,9 +47,8 @@ jobs: with: push: true context: docker - tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:ubuntu-${{matrix.ubuntu}}-opencv-${{matrix.opencv}}-${{matrix.compiler.label}} + tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:ubuntu-${{matrix.ubuntu}}-opencv-${{matrix.opencv}} labels: ${{steps.meta.outputs.labels}} build-args: | OPENCV_TAG=${{matrix.opencv}} UBUNTU_TAG=${{matrix.ubuntu}} - COMPILER=${{matrix.compiler.cmd}} diff --git a/docker/Dockerfile b/docker/Dockerfile index 9c75a845..1ac39f69 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,13 +2,13 @@ ARG UBUNTU_TAG FROM ubuntu:${UBUNTU_TAG} ARG OPENCV_TAG -ARG COMPILER ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install -y \ - ${COMPILER} \ + g++ \ + clang \ cmake \ wget \ unzip \