From 046383d18873e13bbb3133ac212d60b78948d511 Mon Sep 17 00:00:00 2001 From: default_writer Date: Thu, 11 Sep 2025 08:31:00 +0300 Subject: [PATCH 1/7] v1 --- Dockerfile | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/Dockerfile b/Dockerfile index db63febd..bad36e20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,44 +1,44 @@ FROM ubuntu:24.04 -ENV TZ=Europe/Istanbul +# ENV TZ=Europe/Istanbul -# Install sudo and other necessary packages -RUN ln -snf /usr/share/zoneinfo/"$TZ" /etc/localtime && echo "$TZ" > /etc/timezone && \ - apt -y update && \ - export DEBIAN_FRONTEND=noninteractive && \ - apt -y install --no-install-recommends -y \ - build-essential \ - ca-certificates \ - nodejs \ - npm \ - python3 \ - python3-venv \ - python3-virtualenv \ - clangd \ - cmake \ - curl \ - g++ \ - gcc \ - gdb \ - gettext-base \ - git \ - gnupg \ - lcov \ - lldb \ - lsb-release \ - make \ - ninja-build \ - software-properties-common \ - sudo \ - wget && \ - apt -y upgrade && \ - apt autoclean -y && \ - apt autoremove -y && \ - rm -rf /var/lib/{cache,log}/ && \ - rm -rf /tmp/* /var/tmp/* && \ - rm -rf /usr/share/doc/ && \ - rm -rf /usr/share/man/ && \ - rm -rf /var/lib/apt/lists/* +# # Install sudo and other necessary packages +# RUN ln -snf /usr/share/zoneinfo/"$TZ" /etc/localtime && echo "$TZ" > /etc/timezone && \ +# apt -y update && \ +# export DEBIAN_FRONTEND=noninteractive && \ +# apt -y install --no-install-recommends -y \ +# build-essential \ +# ca-certificates \ +# nodejs \ +# npm \ +# python3 \ +# python3-venv \ +# python3-virtualenv \ +# clangd \ +# cmake \ +# curl \ +# g++ \ +# gcc \ +# gdb \ +# gettext-base \ +# git \ +# gnupg \ +# lcov \ +# lldb \ +# lsb-release \ +# make \ +# ninja-build \ +# software-properties-common \ +# sudo \ +# wget && \ +# apt -y upgrade && \ +# apt autoclean -y && \ +# apt autoremove -y && \ +# rm -rf /var/lib/{cache,log}/ && \ +# rm -rf /tmp/* /var/tmp/* && \ +# rm -rf /usr/share/doc/ && \ +# rm -rf /usr/share/man/ && \ +# rm -rf /var/lib/apt/lists/* # Set the working directory WORKDIR /workspace @@ -47,4 +47,4 @@ WORKDIR /workspace COPY bin /workspace/bin # Run the initialization script -RUN ./bin/init.sh --init --lcov --setup +#RUN ./bin/init.sh --init --lcov --setup From 85b9a95fd9605cc61419834ebf80d17c40aabd00 Mon Sep 17 00:00:00 2001 From: default_writer Date: Thu, 11 Sep 2025 08:33:25 +0300 Subject: [PATCH 2/7] added git --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bad36e20..7dc66bc1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ FROM ubuntu:24.04 # ENV TZ=Europe/Istanbul # # Install sudo and other necessary packages +RUN \ # RUN ln -snf /usr/share/zoneinfo/"$TZ" /etc/localtime && echo "$TZ" > /etc/timezone && \ # apt -y update && \ # export DEBIAN_FRONTEND=noninteractive && \ @@ -21,7 +22,7 @@ FROM ubuntu:24.04 # gcc \ # gdb \ # gettext-base \ -# git \ + git \ # gnupg \ # lcov \ # lldb \ @@ -38,7 +39,7 @@ FROM ubuntu:24.04 # rm -rf /tmp/* /var/tmp/* && \ # rm -rf /usr/share/doc/ && \ # rm -rf /usr/share/man/ && \ -# rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* # Set the working directory WORKDIR /workspace From 4e969bd3522767ba2f6ad6520e8a8ec10b262d0e Mon Sep 17 00:00:00 2001 From: default_writer Date: Thu, 11 Sep 2025 08:35:00 +0300 Subject: [PATCH 3/7] v1 --- .github/workflows/c-cpp.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index f293a825..77491431 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,9 +14,9 @@ jobs: image: defaultwriter/c-image-repo:latest steps: - uses: actions/checkout@v4 - with: - submodules: true - fetch-depth: 0 + # with: + # submodules: true + # fetch-depth: 0 - name: config run: git config --global --add safe.directory ${GITHUB_WORKSPACE} - name: coverage From 3ad00ee61814ed10c5b417e8f6bc44520dbd228f Mon Sep 17 00:00:00 2001 From: default_writer Date: Thu, 11 Sep 2025 08:36:07 +0300 Subject: [PATCH 4/7] v1 --- .github/workflows/c-cpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 77491431..e852435b 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -17,8 +17,8 @@ jobs: # with: # submodules: true # fetch-depth: 0 - - name: config - run: git config --global --add safe.directory ${GITHUB_WORKSPACE} + # - name: config + # run: git config --global --add safe.directory ${GITHUB_WORKSPACE} - name: coverage run: ./bin/coverageall.sh --all --clean - name: sonarscanner From f7a475a4ceecdf8123f1900981688da236a1964f Mon Sep 17 00:00:00 2001 From: default_writer Date: Thu, 11 Sep 2025 09:16:45 +0300 Subject: [PATCH 5/7] v1 --- Dockerfile | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7dc66bc1..a6917e71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,18 @@ FROM ubuntu:24.04 # ENV TZ=Europe/Istanbul # # Install sudo and other necessary packages -RUN \ +RUN apt -y update && \ + export DEBIAN_FRONTEND=noninteractive && \ + apt -y install --no-install-recommends -y git cmake lcov && \ + apt -y upgrade && \ + apt autoclean -y && \ + apt autoremove -y && \ + rm -rf /var/lib/{cache,log}/ && \ + rm -rf /tmp/* /var/tmp/* && \ + rm -rf /usr/share/doc/ && \ + rm -rf /usr/share/man/ && \ + rm -rf /var/lib/apt/lists/* + # RUN ln -snf /usr/share/zoneinfo/"$TZ" /etc/localtime && echo "$TZ" > /etc/timezone && \ # apt -y update && \ # export DEBIAN_FRONTEND=noninteractive && \ @@ -22,7 +33,7 @@ RUN \ # gcc \ # gdb \ # gettext-base \ - git \ +# git \ # gnupg \ # lcov \ # lldb \ @@ -39,7 +50,7 @@ RUN \ # rm -rf /tmp/* /var/tmp/* && \ # rm -rf /usr/share/doc/ && \ # rm -rf /usr/share/man/ && \ - rm -rf /var/lib/apt/lists/* +# rm -rf /var/lib/apt/lists/* # Set the working directory WORKDIR /workspace From d88d087e8716b52a50d93d68a88d5866c884d817 Mon Sep 17 00:00:00 2001 From: default_writer Date: Thu, 11 Sep 2025 09:19:52 +0300 Subject: [PATCH 6/7] v1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a6917e71..760e5dec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM ubuntu:24.04 # # Install sudo and other necessary packages RUN apt -y update && \ export DEBIAN_FRONTEND=noninteractive && \ - apt -y install --no-install-recommends -y git cmake lcov && \ + apt -y install --no-install-recommends -y cmake lcov && \ apt -y upgrade && \ apt autoclean -y && \ apt autoremove -y && \ From c34a7feef5e6434b990bf292f7054c5c23764fe0 Mon Sep 17 00:00:00 2001 From: default_writer Date: Thu, 11 Sep 2025 10:14:50 +0300 Subject: [PATCH 7/7] updates --- Dockerfile | 52 +++++--------------------------------------- bin/library/cmake.sh | 9 ++++---- 2 files changed, 10 insertions(+), 51 deletions(-) diff --git a/Dockerfile b/Dockerfile index 760e5dec..fd41b8fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,62 +1,22 @@ FROM ubuntu:24.04 -# ENV TZ=Europe/Istanbul +ENV TZ=Europe/Moscow -# # Install sudo and other necessary packages -RUN apt -y update && \ - export DEBIAN_FRONTEND=noninteractive && \ - apt -y install --no-install-recommends -y cmake lcov && \ +RUN ln -snf /usr/share/zoneinfo/"$TZ" /etc/localtime && echo "$TZ" > /etc/timezone && \ + apt -y update && \ + export DEBIAN_FRONTEND=noninteractive && \ + apt -y install --no-install-recommends -y git ca-certificates gcc g++ make cmake ninja-build lcov && \ apt -y upgrade && \ apt autoclean -y && \ apt autoremove -y && \ rm -rf /var/lib/{cache,log}/ && \ rm -rf /tmp/* /var/tmp/* && \ rm -rf /usr/share/doc/ && \ - rm -rf /usr/share/man/ && \ + rm -rf /usr/share/man/ && \ rm -rf /var/lib/apt/lists/* -# RUN ln -snf /usr/share/zoneinfo/"$TZ" /etc/localtime && echo "$TZ" > /etc/timezone && \ -# apt -y update && \ -# export DEBIAN_FRONTEND=noninteractive && \ -# apt -y install --no-install-recommends -y \ -# build-essential \ -# ca-certificates \ -# nodejs \ -# npm \ -# python3 \ -# python3-venv \ -# python3-virtualenv \ -# clangd \ -# cmake \ -# curl \ -# g++ \ -# gcc \ -# gdb \ -# gettext-base \ -# git \ -# gnupg \ -# lcov \ -# lldb \ -# lsb-release \ -# make \ -# ninja-build \ -# software-properties-common \ -# sudo \ -# wget && \ -# apt -y upgrade && \ -# apt autoclean -y && \ -# apt autoremove -y && \ -# rm -rf /var/lib/{cache,log}/ && \ -# rm -rf /tmp/* /var/tmp/* && \ -# rm -rf /usr/share/doc/ && \ -# rm -rf /usr/share/man/ && \ -# rm -rf /var/lib/apt/lists/* - # Set the working directory WORKDIR /workspace # Copy all source files needed to run the initialization COPY bin /workspace/bin - -# Run the initialization script -#RUN ./bin/init.sh --init --lcov --setup diff --git a/bin/library/cmake.sh b/bin/library/cmake.sh index 6b420366..a5f2279f 100755 --- a/bin/library/cmake.sh +++ b/bin/library/cmake.sh @@ -84,7 +84,7 @@ function get-cmake() { if [[ "${cmake}" == "" ]]; then cmake=$(command -v cmake) fi - echo ${cmake} + echo "${cmake}" } function get-targets() { @@ -241,21 +241,20 @@ function get-config() { cmake=$(get-cmake) if [[ "${cmake}" == "" ]]; then - echo cmake not found. please run "${pwd}/bin/utils/install.sh" --cmake - exit 8 + cmake="cmake" fi if [[ ! -d "${pwd}/config" ]]; then exec >/dev/null 2>&1 build="${pwd}/config" - ${cmake} \ + echo $(${cmake} \ -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE \ -DTARGETS:BOOL=ON \ "${cmake-options}" \ -S"${pwd}" \ -B"${build}" \ - -G "Ninja" >/dev/null 2>&1 + -G "Ninja" >/dev/null 2>&1) # exec 1>&2 2>&- fi