From bfd1553167ead01e1fcde01aef7f2d9c90a0bac9 Mon Sep 17 00:00:00 2001 From: Mikhail Voronin Date: Sat, 15 Feb 2025 21:18:26 +0300 Subject: [PATCH] Adjustment --- .github/workflows/C++_app.yml | 5 +++-- app_C++/Dockerfile | 8 ++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/C++_app.yml b/.github/workflows/C++_app.yml index 6c11e65115..85dd734769 100644 --- a/.github/workflows/C++_app.yml +++ b/.github/workflows/C++_app.yml @@ -35,7 +35,8 @@ jobs: python -m pip install --upgrade pip pip install -r app_C++/requirements.txt sudo apt update - sudo apt install cppcheck + sudo apt install cppcheck wget + sudo mkdir -p /usr/local/include && sudo wget https://raw.githubusercontent.com/yhirose/cpp-httplib/master/httplib.h -O /usr/local/include/httplib.h - name: Lint with Cppcheck run: | @@ -43,7 +44,7 @@ jobs: - name: Run tests run: | - python app_C++/unittests.py + cd app_C++ && python unittests.py - name: Login to Docker Hub uses: docker/login-action@v2 diff --git a/app_C++/Dockerfile b/app_C++/Dockerfile index c666f539e5..5b0edf1573 100644 --- a/app_C++/Dockerfile +++ b/app_C++/Dockerfile @@ -1,12 +1,8 @@ FROM alpine:3.19 WORKDIR /app COPY app.cpp ./ -RUN apk add --no-cache \ - g++ \ - make \ - wget \ - linux-headers -RUN mkdir /usr/local/include && wget https://raw.githubusercontent.com/yhirose/cpp-httplib/master/httplib.h -O /usr/local/include/httplib.h +RUN apk add --no-cache wget g++ +RUN mkdir -p /usr/local/include && wget https://raw.githubusercontent.com/yhirose/cpp-httplib/master/httplib.h -O /usr/local/include/httplib.h RUN g++ app.cpp -o app RUN adduser app_user || $(chown -R app_user:app_user /app && true) USER app_user