Commit e626a032 authored by Ramon Nou's avatar Ramon Nou
Browse files

build(docker): update 0.9.7 docker and deps to clang-format-22

parent 7750be76

docker/0.9.7/deps/Dockerfile

+3 −1
Changes for docker/0.9.7/deps/Dockerfile: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -24,7 +24,9 @@ RUN apt-get update && \ 
  libnuma-dev libyaml-dev libcurl4-openssl-dev \

  libfuse3-dev fuse3 \

  procps \

  kmod && \

  kmod \

  clang-format-22 && \

  update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-22 100 && \

  rm -rf /var/lib/apt/lists/* && \

  apt-get clean && apt-get autoclean

docker/0.9.7/linter/Dockerfile

+2 −2
Changes for docker/0.9.7/linter/Dockerfile: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ LABEL Description="Debian-based environment to check the formatting of GekkoFS c 


RUN apt-get update && \

  apt-get install -y --no-install-recommends \

  # clang 15 deps for clang-format

  lsb-release \

  wget \

  gnupg2 \

  clang-format && \

  clang-format-22 && \

  update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-22 100 && \

  rm -rf /var/lib/apt/lists/* && \

  # Clean apt caches of packages

  apt-get clean && apt-get autoclean

scripts/check_format.sh

+4 −1
Changes for scripts/check_format.sh: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ optional arguments: 
                        (default: 'pwd/include')

    -c <CLANG_FORMAT_BIN>, --clang_format_path <CLANG_FORMAT_BIN>

                        path to clang-format binary

                        (default: looks for 'clang-format' or 'clang-format-10')

                        (default: looks for 'clang-format', 'clang-format-22', or 'clang-format-19')

    -r, --run_format    run clang-formatter before formatting check

                        DISCLAIMER: FILES ARE MODIFIED IN PLACE!

    -v, --verbose       shows the diff of all files
@@ -116,6 +116,8 @@ set -- "${POSITIONAL[@]}" # restore positional parameters 
# check for clang-format executable if it hasn't been set by the user

if [[ -z $CLANG_FORMAT_BIN ]]; then

    CLANG_FORMAT_BIN=$(command -v clang-format)

    if [[ -z $CLANG_FORMAT_BIN ]]; then

        CLANG_FORMAT_BIN=$(command -v clang-format-22)

        if [[ -z $CLANG_FORMAT_BIN ]]; then

            CLANG_FORMAT_BIN=$(command -v clang-format-19)

            # if it still doesn't exist exit
@@ -125,6 +127,7 @@ if [[ -z $CLANG_FORMAT_BIN ]]; then 
            fi

        fi

    fi

fi

echo "* Using clang-format binary: $CLANG_FORMAT_BIN"

echo "* Using version: $($CLANG_FORMAT_BIN --version)"

scripts/docker/Dockerfile.deps

+2 −1
Changes for scripts/docker/Dockerfile.deps: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ RUN apt-get update && \ 
    libjson-c-dev liblz4-dev libboost-program-options-dev \

    uuid-dev ccache cmake python3 python3-pip python3-dev \

    python3-venv python3-setuptools libnuma-dev libyaml-dev \

    libcurl4-openssl-dev && \

    libcurl4-openssl-dev clang-format-22 && \

    update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-22 100 && \

    rm -rf /var/lib/apt/lists/* && \

    apt-get clean && apt-get autoclean