From ab1b46f50181b2ff24ec77ba46f2d6105dfd3d9d Mon Sep 17 00:00:00 2001 From: Sergey Kuznetsov Date: Mon, 11 Dec 2023 13:58:48 +0000 Subject: [PATCH] Debug docker build --- .github/workflows/update_docker_ci.yml | 17 +++++++++++------ docker/ci/dockerfile | 14 +++++++------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/workflows/update_docker_ci.yml b/.github/workflows/update_docker_ci.yml index 61c5a91bf..51bfdc368 100644 --- a/.github/workflows/update_docker_ci.yml +++ b/.github/workflows/update_docker_ci.yml @@ -5,6 +5,11 @@ on: paths: - 'docker/ci/**' workflow_dispatch: + pull_request: + branches: [develop] + paths: + - 'docker/ci/**' + - .github/workflows/update_docker_ci.yml jobs: build: @@ -16,11 +21,11 @@ jobs: env: DOCKERHUB_REPO: rippleci steps: - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USER }} - password: ${{ secrets.DOCKERHUB_PW }} + # - name: Login to DockerHub + # uses: docker/login-action@v3 + # with: + # username: ${{ secrets.DOCKERHUB_USER }} + # password: ${{ secrets.DOCKERHUB_PW }} - uses: actions/checkout@v4 @@ -31,6 +36,6 @@ jobs: docker build . -t clio_ci --progress=plain --platform=${{ matrix.target_platform }} for tag in "$GITHUB_SHA" "latest" ; do docker tag clio_ci ${DOCKERHUB_REPO}/clio_ci:${tag} - docker push ${DOCKERHUB_REPO}/clio_ci:${tag} + # docker push ${DOCKERHUB_REPO}/clio_ci:${tag} done diff --git a/docker/ci/dockerfile b/docker/ci/dockerfile index 4ed86de7c..e95fff064 100644 --- a/docker/ci/dockerfile +++ b/docker/ci/dockerfile @@ -10,13 +10,13 @@ ENV GCC_VERSION=11 \ GH_VERSION=2.40.0 # Add repositories -RUN apt-get -qq update \ - && apt-get -qq install -y --no-install-recommends --no-install-suggests gnupg wget curl software-properties-common \ - && add-apt-repository -y ppa:ubuntu-toolchain-r/test \ - && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key add - \ - && apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' \ - && echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-${LLVM_TOOLS_VERSION} main" >> /etc/apt/sources.list \ - && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - +RUN apt-get -qq update +RUN apt-get -qq install -y --no-install-recommends --no-install-suggests gnupg wget curl software-properties-common +RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test +RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key add - +RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' +RUN echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-${LLVM_TOOLS_VERSION} main" >> /etc/apt/sources.list +RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add # Install packages RUN apt update -qq \