Skip to content

Commit

Permalink
chore(ci): fix container publishing
Browse files Browse the repository at this point in the history
  • Loading branch information
aPere3 committed Feb 25, 2025
1 parent f2bc945 commit c5fd53d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 93 deletions.
48 changes: 1 addition & 47 deletions .github/workflows/concrete_compiler_publish_docker_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,52 +37,6 @@ jobs:
backend: aws
profile: cpu-test

# Not sure what to do about this one...
hpx-image:
needs: [setup-instance]
runs-on: ${{ needs.setup-instance.outputs.runner-name }}
env:
image: ghcr.io/zama-ai/hpx
dockerfile: docker/Dockerfile.hpx-env
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@bab30c2299617f6615ec02a68b9a40d10bd21366 # v44.5.24
- name: Login
id: login
if: contains(steps.changed-files.outputs.modified_files, env.dockerfile) || contains(steps.changed-files.outputs.modified_files, env.THIS_FILE)
run: echo "${{ secrets.GHCR_PASSWORD }}" | docker login -u ${{ secrets.GHCR_LOGIN }} --password-stdin ghcr.io
- name: Build
if: ${{ steps.login.conclusion != 'skipped' }}
run: docker build -t "${{ env.image }}" -f ${{ env.dockerfile }} .
- name: Run Trivy vulnerability scanner
if: ${{ steps.login.conclusion != 'skipped' }}
uses: aquasecurity/trivy-action@18f2510ee396bbf400402947b394f2dd8c87dbb0 # 0.29.0
with:
image-ref: '${{ env.image }}'
format: 'sarif'
scanners: vuln,secret
output: trivy-out-docker.sarif
- name: Upload Trivy scan results to GitHub Security tab
if: ${{ steps.login.conclusion != 'skipped' }}
uses: github/codeql-action/upload-sarif@86b04fb0e47484f7282357688f21d5d0e32175fe # v3.27.6
with:
sarif_file: trivy-out-docker.sarif
category: trivy-docker
- name: Publish
if: ${{ steps.login.conclusion != 'skipped' }}
run: docker push "${{ env.image }}:latest"
- name: Slack Notification
if: ${{ failure() && github.ref == 'refs/heads/main' }}
continue-on-error: true
uses: rtCamp/action-slack-notify@c33737706dea87cd7784c687dadc9adf1be59990
env:
SLACK_COLOR: ${{ job.status }}
SLACK_MESSAGE: "hpx-image finished with status: ${{ job.status }}. (${{ env.ACTION_RUN_URL }})"

cuda-image:
needs: [setup-instance]
runs-on: ${{ needs.setup-instance.outputs.runner-name }}
Expand Down Expand Up @@ -146,7 +100,7 @@ jobs:
SLACK_MESSAGE: "cuda-image finished with status: ${{ job.status }}. (${{ env.ACTION_RUN_URL }})"

compiler-image:
needs: [setup-instance, hpx-image, cuda-image]
needs: [setup-instance, cuda-image]
runs-on: ${{ needs.setup-instance.outputs.runner-name }}
env:
image: ghcr.io/zama-ai/concrete-compiler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function(fetch_hpx_library)
)
set(HPX_WITH_FETCH_ASIO ON CACHE BOOL INTERNAL)
set(HPX_WITH_FETCH_HWLOC ON CACHE BOOL INTERNAL)
set(HPX_WITH_FETCH_BOOST OFF CACHE BOOL INTERNAL)
set(HPX_WITH_FETCH_BOOST ON CACHE BOOL INTERNAL)
set(HPX_WITH_MALLOC system CACHE STRING INTERNAL)
set(HPX_WITH_EXAMPLES OFF CACHE BOOL INTERNAL)
set(HPX_WITH_TESTS OFF CACHE BOOL INTERNAL)
Expand Down
10 changes: 1 addition & 9 deletions docker/Dockerfile.concrete-compiler-env
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM quay.io/pypa/manylinux_2_28_x86_64:2024-02-08-a1b4ddc
# epel-release is for install ccache
RUN dnf clean all && dnf install -y epel-release && dnf clean all
# hadolint ignore=DL3041
RUN dnf update -y && dnf install -y ninja-build hwloc-devel ccache ncurses-devel openssh-clients graphviz graphviz-devel && dnf clean all
RUN dnf update -y && dnf install -y ninja-build ccache ncurses-devel openssh-clients graphviz graphviz-devel && dnf clean all
RUN mkdir -p ~/.ssh/ && ssh-keyscan -t ecdsa github.com >> ~/.ssh/known_hosts
# Setup gcc-11 (required for cuda11.8)
RUN dnf install -y gcc-toolset-11 && dnf clean all
Expand Down Expand Up @@ -36,14 +36,6 @@ RUN groupadd -g 10001 grp02 && \
mkdir -p /home/usr01 && chown -R usr01:grp02 /home/usr01 /boost_1_71_0 /workdir /build
# Switch to the non-root user
USER usr01:grp02
# Install boost
ADD https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.gz /boost_1_71_0.tar.gz
RUN tar -xzvf /boost_1_71_0.tar.gz
WORKDIR /boost_1_71_0
RUN ./bootstrap.sh && ./b2 --with-filesystem install
# Setup HPX
COPY --from=ghcr.io/zama-ai/hpx:latest /hpx /hpx
ENV HPX_INSTALL_DIR=/hpx/build
# Setup CUDA
COPY --from=ghcr.io/zama-ai/cuda:11-8 /usr/local/cuda-11.8/ /usr/local/cuda-11.8/
ENV PATH "$PATH:/usr/local/cuda-11.8/bin"
Expand Down
36 changes: 0 additions & 36 deletions docker/Dockerfile.hpx-env

This file was deleted.

0 comments on commit c5fd53d

Please sign in to comment.