container: install clang-format from Ubuntu

Signed-off-by: Peter Colberg <[email protected]>
(cherry picked from commit 11c8f4f)

Author: pcolberg

.github/workflows/container.yml

@@ -40,7 +40,6 @@ on:
       - 'container/opensuse-leap-15-dev/**'
       - 'container/ubuntu-18.04-dev/**'
       - 'container/ubuntu-20.04-dev/**'
-      - 'container/ubuntu-20.04-clang/**'
       - 'container/ubuntu-22.04-dev/**'
       - 'scripts/install_aocl.sh'
 
@@ -53,7 +52,6 @@ on:
       - 'container/opensuse-leap-15-dev/**'
       - 'container/ubuntu-18.04-dev/**'
       - 'container/ubuntu-20.04-dev/**'
-      - 'container/ubuntu-20.04-clang/**'
       - 'container/ubuntu-22.04-dev/**'
       - 'scripts/install_aocl.sh'
 
@@ -75,7 +73,6 @@ jobs:
           - opensuse-leap-15-dev
           - ubuntu-18.04-dev
           - ubuntu-20.04-dev
-          - ubuntu-20.04-clang
           - ubuntu-22.04-dev
 
     env:

container/ubuntu-20.04-clang/Dockerfile

@@ -25,6 +25,7 @@ RUN apt-get -y update \
   && DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade \
   build-essential \
   ca-certificates \
+  clang-format-13 \
   cmake \
   curl \
   git \
@@ -45,5 +46,6 @@ RUN apt-get -y update \
 USER build
 WORKDIR /home/build
 
-ENV PATH="/opt/aocl/hld/bin:$PATH"
+ENV PATH="/opt/aocl/hld/bin:/usr/lib/llvm-13/bin:$PATH"
 RUN aoc -version
+RUN clang-format --version