diff --git a/.github/workflows/benchmark_commits.yml b/.github/workflows/benchmark_commits.yml index 9a4327d1e7..abd7b23a95 100644 --- a/.github/workflows/benchmark_commits.yml +++ b/.github/workflows/benchmark_commits.yml @@ -19,7 +19,7 @@ jobs: always() && !cancelled() runs-on: ${{ needs.start_ec2_runner.outputs.label }} - container: quay.io/pypa/manylinux_2_28_x86_64:latest + container: ghcr.io/man-group/arcticdb-dev:latest env: # this is potentially overflowing the cache, so should be looked into after we address issue #1057 SCCACHE_GHA_VERSION: ${{vars.SCCACHE_GHA_VERSION || 1}} # Setting this env var enables the caching @@ -48,9 +48,6 @@ jobs: uses: mozilla-actions/sccache-action@v0.0.3 with: version: "v0.4.0" - - - name: Install deps - uses: ./.github/actions/setup_deps - name: Extra envs shell: bash -l {0} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 210a5813eb..d9c74b155f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,7 @@ jobs: mongodb: image: "mongo:4.4" container: - image: quay.io/pypa/manylinux_2_28_x86_64 + image: ghcr.io/man-group/arcticdb-dev:latest volumes: - /:/mnt windows_matrix: diff --git a/.github/workflows/build_steps.yml b/.github/workflows/build_steps.yml index d90e1e59c3..346c5cde97 100644 --- a/.github/workflows/build_steps.yml +++ b/.github/workflows/build_steps.yml @@ -87,10 +87,6 @@ jobs: maximum-size: 6GB disk-root: "D:" # This is also the checkout directory. Total size 12GB. continue-on-error: true - - - name: Install deps - if: matrix.os == 'linux' && inputs.job_type != 'build-python-wheels' - uses: ./.github/actions/setup_deps - name: Extra envs # This has to come after msvc-dev-cmd to overwrite the bad VCPKG_ROOT it sets diff --git a/docker/Dockerfile b/docker/Dockerfile index 9d07aa2812..2dfb5c324b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,7 +3,7 @@ FROM quay.io/pypa/manylinux_2_28_x86_64 RUN dnf update -y RUN dnf remove -y 'gcc-toolset-*' RUN dnf install -y zip flex bison gcc-toolset-10 gcc-toolset-10-gdb gcc-toolset-10-libatomic-devel krb5-devel cyrus-sasl-devel openssl-devel \ -unzip tar epel-release jq wget libcurl-devel \ +unzip tar epel-release jq wget libcurl-devel git-lfs \ python3.11-devel python3.11-pip perl-IPC-Cmd RUN dnf groupinstall -y 'Development Tools'