From eac14d4001b0f329de0d5cdd974983e3d006734d Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Sun, 25 Jan 2026 19:11:18 +0100 Subject: [PATCH] more secure image --- .gitea/workflows/ci.yaml | 6 +----- Linux/BigfootBuilder/Dockerfile | 8 +++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index df9a8b9..1a02dda 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -110,8 +110,6 @@ jobs: tags: ${{ env.BIGFOOT_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} build-args: | BASE_BUILDER=${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} - ARTIFACTORY_CONAN_USER=${{ secrets.ARTIFACTORY_USER }} - ARTIFACTORY_CONAN_PASSWORD=${{ secrets.ARTIFACTORY_PASSWORD }} CONAN_RELEASE_PROFILE=clang CONAN_RELWITHDEBINFO_PROFILE=clangd CONAN_DEBUG_PROFILE=clangd @@ -123,7 +121,7 @@ jobs: -e CONAN_LOGIN_USERNAME=${{ secrets.ARTIFACTORY_USER }} \ -e CONAN_PASSWORD=${{ secrets.ARTIFACTORY_PASSWORD }} \ ${{ env.BIGFOOT_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} \ - bash -c "conan upload '*' --remote=bigfootpackages --force --confirm" + conan upload '*' --remote=bigfootpackages --force --confirm build-bigfootcoverage-builder: runs-on: ubuntu-latest @@ -157,8 +155,6 @@ jobs: tags: ${{ env.BIGFOOT_COVERAGE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} build-args: | BASE_BUILDER=${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} - ARTIFACTORY_CONAN_USER=${{ secrets.ARTIFACTORY_USER }} - ARTIFACTORY_CONAN_PASSWORD=${{ secrets.ARTIFACTORY_PASSWORD }} CONAN_RELEASE_PROFILE=gcc_coverage CONAN_RELWITHDEBINFO_PROFILE=gcc_coverage CONAN_DEBUG_PROFILE=gcc_coverage diff --git a/Linux/BigfootBuilder/Dockerfile b/Linux/BigfootBuilder/Dockerfile index b9a5926..1768d4a 100644 --- a/Linux/BigfootBuilder/Dockerfile +++ b/Linux/BigfootBuilder/Dockerfile @@ -5,8 +5,6 @@ FROM $BASE_BUILDER ARG CONAN_RELEASE_PROFILE ARG CONAN_RELWITHDEBINFO_PROFILE ARG CONAN_DEBUG_PROFILE -ARG ARTIFACTORY_CONAN_USER -ARG ARTIFACTORY_CONAN_PASSWORD ARG PACKAGES_CHANNEL RUN apt-get update \ @@ -30,7 +28,7 @@ RUN apt-get update \ COPY conanfile.py BigfootDependencies/conanfile.py RUN ccache --zero-stats \ - && CONAN_LOGIN_USERNAME=${ARTIFACTORY_CONAN_USER} CONAN_PASSWORD=${ARTIFACTORY_CONAN_PASSWORD} conan install ./BigfootDependencies -o Requirements/*:packages_channel=${PACKAGES_CHANNEL} --remote=bigfootpackages --build="*" -pr:h=${CONAN_RELEASE_PROFILE} -pr:b=${CONAN_RELEASE_PROFILE} -s build_type=Release \ - && CONAN_LOGIN_USERNAME=${ARTIFACTORY_CONAN_USER} CONAN_PASSWORD=${ARTIFACTORY_CONAN_PASSWORD} conan install ./BigfootDependencies -o Requirements/*:packages_channel=${PACKAGES_CHANNEL} --remote=bigfootpackages --build="*" -pr:h=${CONAN_RELWITHDEBINFO_PROFILE} -pr:b=${CONAN_RELWITHDEBINFO_PROFILE} -s build_type=RelWithDebInfo \ - && CONAN_LOGIN_USERNAME=${ARTIFACTORY_CONAN_USER} CONAN_PASSWORD=${ARTIFACTORY_CONAN_PASSWORD} conan install ./BigfootDependencies -o Requirements/*:packages_channel=${PACKAGES_CHANNEL} --remote=bigfootpackages --build="*" -pr:h=${CONAN_DEBUG_PROFILE} -pr:b=${CONAN_DEBUG_PROFILE} -s build_type=Debug \ + && conan install ./BigfootDependencies -o Requirements/*:packages_channel=${PACKAGES_CHANNEL} --remote=bigfootpackages --build="*" -pr:h=${CONAN_RELEASE_PROFILE} -pr:b=${CONAN_RELEASE_PROFILE} -s build_type=Release \ + && conan install ./BigfootDependencies -o Requirements/*:packages_channel=${PACKAGES_CHANNEL} --remote=bigfootpackages --build="*" -pr:h=${CONAN_RELWITHDEBINFO_PROFILE} -pr:b=${CONAN_RELWITHDEBINFO_PROFILE} -s build_type=RelWithDebInfo \ + && conan install ./BigfootDependencies -o Requirements/*:packages_channel=${PACKAGES_CHANNEL} --remote=bigfootpackages --build="*" -pr:h=${CONAN_DEBUG_PROFILE} -pr:b=${CONAN_DEBUG_PROFILE} -s build_type=Debug \ && ccache --show-stats \ No newline at end of file