From 2a189bafbf91fb889793d893bd86114953caa240 Mon Sep 17 00:00:00 2001 From: Vaibhav Jain Date: Thu, 6 Jul 2023 02:53:18 +0530 Subject: [PATCH 01/10] Add OWNER file Signed-off-by: Vaibhav Jain --- OWNERS | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 OWNERS diff --git a/OWNERS b/OWNERS new file mode 100644 index 000000000..2fdccd9b4 --- /dev/null +++ b/OWNERS @@ -0,0 +1,19 @@ +approvers: + - anishasthana + - danielezonca + - heyselbi + - israel-hdez + - Jooho + - VedantMahabaleshwarkar + - Xaenalt + - vaibhavjainwiz + +reviewers: + - anishasthana + - danielezonca + - heyselbi + - israel-hdez + - Jooho + - VedantMahabaleshwarkar + - Xaenalt + - vaibhavjainwiz From 67eb631c45916b3b06b44a398b256278912d98db Mon Sep 17 00:00:00 2001 From: jooho Date: Fri, 1 Sep 2023 17:44:42 -0400 Subject: [PATCH 02/10] Add a checking logic to delete miniconda directory Signed-off-by: jooho --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2eca6aa3b..582667b98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -182,7 +182,8 @@ RUN cd ~ && \ bash ./Miniconda3-*-Linux-x86_64.sh -bf -p /opt/miniconda # Remove tests directory containing test private keys -RUN rm -r /opt/miniconda/pkgs/conda-content-trust-*/info/test/tests +# conda clean will clean this directory but just in case, it will check the directory existence and remove it +RUN if [ -d " /opt/miniconda/pkgs/conda-content-trust-*/info/test/tests" ]; then rm -rf "/opt/miniconda/pkgs/conda-content-trust-*/info/test/tests"; fi ENV PATH=/opt/miniconda/bin:$PATH From 66ff883c5a57e9c2ea9aa2cb64844d64c898d466 Mon Sep 17 00:00:00 2001 From: Sean Pryor Date: Tue, 15 Aug 2023 16:34:59 -0400 Subject: [PATCH 03/10] Ensure conda is updated --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 582667b98..2c790bbed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -179,7 +179,10 @@ RUN dnf install -y unzip git ninja-build && dnf clean all RUN cd ~ && \ curl -L -O https://repo.anaconda.com/miniconda/Miniconda3-py39_23.5.2-0-Linux-x86_64.sh && \ chmod +x Miniconda3-*-Linux-x86_64.sh && \ - bash ./Miniconda3-*-Linux-x86_64.sh -bf -p /opt/miniconda + bash ./Miniconda3-*-Linux-x86_64.sh -bf -p /opt/miniconda && \ + /opt/miniconda/bin/conda update -y --all && \ + /opt/miniconda/bin/conda update -y cryptography && \ + /opt/miniconda/bin/conda clean -y --all # Remove tests directory containing test private keys # conda clean will clean this directory but just in case, it will check the directory existence and remove it From 811374b9b0ee96f07fbf4a1ad7966f0fad9619f6 Mon Sep 17 00:00:00 2001 From: heyselbi Date: Wed, 4 Oct 2023 15:49:34 -0400 Subject: [PATCH 04/10] auto add new issues to ODH projects Signed-off-by: heyselbi --- .../workflows/auto-add-issues-to-project.yaml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/auto-add-issues-to-project.yaml diff --git a/.github/workflows/auto-add-issues-to-project.yaml b/.github/workflows/auto-add-issues-to-project.yaml new file mode 100644 index 000000000..e7dd1781f --- /dev/null +++ b/.github/workflows/auto-add-issues-to-project.yaml @@ -0,0 +1,28 @@ +name: Auto Add Issues to Tracking boards +on: + issues: + types: + - opened +jobs: + add-to-project: + name: Add issue to projects + runs-on: ubuntu-latest + steps: + - name: Generate github-app token + id: app-token + uses: getsentry/action-github-app-token@v2 + with: + app_id: ${{ secrets.DEVOPS_APP_ID }} + private_key: ${{ secrets.DEVOPS_APP_PRIVATE_KEY }} + - uses: actions/add-to-project@v0.5.0 + with: + project-url: https://github.com/orgs/opendatahub-io/projects/40 + github-token: ${{ steps.app-token.outputs.token }} + - uses: actions/add-to-project@v0.5.0 + with: + project-url: https://github.com/orgs/opendatahub-io/projects/45 + github-token: ${{ steps.app-token.outputs.token }} + - uses: actions/add-to-project@v0.5.0 + with: + project-url: https://github.com/orgs/opendatahub-io/projects/42 + github-token: ${{ steps.app-token.outputs.token }} \ No newline at end of file From 87b88342af03ec104acec9ddeef02157a5696976 Mon Sep 17 00:00:00 2001 From: Vaibhav Jain Date: Thu, 6 Jul 2023 02:53:18 +0530 Subject: [PATCH 05/10] Add OWNER file Signed-off-by: Vaibhav Jain --- OWNERS | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 OWNERS diff --git a/OWNERS b/OWNERS new file mode 100644 index 000000000..2fdccd9b4 --- /dev/null +++ b/OWNERS @@ -0,0 +1,19 @@ +approvers: + - anishasthana + - danielezonca + - heyselbi + - israel-hdez + - Jooho + - VedantMahabaleshwarkar + - Xaenalt + - vaibhavjainwiz + +reviewers: + - anishasthana + - danielezonca + - heyselbi + - israel-hdez + - Jooho + - VedantMahabaleshwarkar + - Xaenalt + - vaibhavjainwiz From 52925a9307b1bb0cc6f64dee4a6109651c530a02 Mon Sep 17 00:00:00 2001 From: jooho Date: Fri, 1 Sep 2023 17:44:42 -0400 Subject: [PATCH 06/10] Add a checking logic to delete miniconda directory Signed-off-by: jooho --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index d11340858..58fe83c28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -182,6 +182,10 @@ RUN cd ~ && \ chmod +x Miniconda3-*-Linux-x86_64.sh && \ bash ./Miniconda3-*-Linux-x86_64.sh -bf -p /opt/miniconda +# Remove tests directory containing test private keys +# conda clean will clean this directory but just in case, it will check the directory existence and remove it +RUN if [ -d " /opt/miniconda/pkgs/conda-content-trust-*/info/test/tests" ]; then rm -rf "/opt/miniconda/pkgs/conda-content-trust-*/info/test/tests"; fi + ENV PATH=/opt/miniconda/bin:$PATH # Install specific version of torch From a1c2a3b17649842d577516b9e5599c9473f77f69 Mon Sep 17 00:00:00 2001 From: Sean Pryor Date: Tue, 15 Aug 2023 16:34:59 -0400 Subject: [PATCH 07/10] Ensure conda is updated --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 58fe83c28..41289d1c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -180,7 +180,10 @@ RUN dnf install -y unzip git ninja-build && dnf clean all RUN cd ~ && \ curl -L -O https://repo.anaconda.com/miniconda/Miniconda3-py311_23.9.0-0-Linux-x86_64.sh && \ chmod +x Miniconda3-*-Linux-x86_64.sh && \ - bash ./Miniconda3-*-Linux-x86_64.sh -bf -p /opt/miniconda + bash ./Miniconda3-*-Linux-x86_64.sh -bf -p /opt/miniconda && \ + /opt/miniconda/bin/conda update -y --all && \ + /opt/miniconda/bin/conda update -y cryptography && \ + /opt/miniconda/bin/conda clean -y --all # Remove tests directory containing test private keys # conda clean will clean this directory but just in case, it will check the directory existence and remove it From 2472975254341905837e03c61a21b625e8ee26ae Mon Sep 17 00:00:00 2001 From: heyselbi Date: Wed, 4 Oct 2023 15:49:34 -0400 Subject: [PATCH 08/10] auto add new issues to ODH projects Signed-off-by: heyselbi --- .../workflows/auto-add-issues-to-project.yaml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/auto-add-issues-to-project.yaml diff --git a/.github/workflows/auto-add-issues-to-project.yaml b/.github/workflows/auto-add-issues-to-project.yaml new file mode 100644 index 000000000..e7dd1781f --- /dev/null +++ b/.github/workflows/auto-add-issues-to-project.yaml @@ -0,0 +1,28 @@ +name: Auto Add Issues to Tracking boards +on: + issues: + types: + - opened +jobs: + add-to-project: + name: Add issue to projects + runs-on: ubuntu-latest + steps: + - name: Generate github-app token + id: app-token + uses: getsentry/action-github-app-token@v2 + with: + app_id: ${{ secrets.DEVOPS_APP_ID }} + private_key: ${{ secrets.DEVOPS_APP_PRIVATE_KEY }} + - uses: actions/add-to-project@v0.5.0 + with: + project-url: https://github.com/orgs/opendatahub-io/projects/40 + github-token: ${{ steps.app-token.outputs.token }} + - uses: actions/add-to-project@v0.5.0 + with: + project-url: https://github.com/orgs/opendatahub-io/projects/45 + github-token: ${{ steps.app-token.outputs.token }} + - uses: actions/add-to-project@v0.5.0 + with: + project-url: https://github.com/orgs/opendatahub-io/projects/42 + github-token: ${{ steps.app-token.outputs.token }} \ No newline at end of file From a57bdf1310bfa04e22defdf255b8b18a18ff2fe7 Mon Sep 17 00:00:00 2001 From: Sean Pryor Date: Mon, 20 Nov 2023 12:19:00 -0500 Subject: [PATCH 09/10] Ensure final dockerfile updates packages Signed-off-by: Sean Pryor --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 41289d1c8..05d2c5a64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -253,6 +253,8 @@ COPY --from=flash-att-v2-builder /usr/src/flash-attention-v2/build /usr/src/flas FROM cuda-runtime as server-release ARG SITE_PACKAGES=/opt/miniconda/lib/python3.11/site-packages +RUN dnf update -y + # Install C++ compiler (required at runtime when PT2_COMPILE is enabled) RUN dnf install -y gcc-c++ && dnf clean all \ && useradd -u 2000 tgis -m -g 0 From c956c3dcb4d8a8347fd741dd48ee50e425516201 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 03:34:00 +0000 Subject: [PATCH 10/10] Bump openssl from 0.10.55 to 0.10.60 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.55 to 0.10.60. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.55...openssl-v0.10.60) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- router/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 87421ac25..73ba4d84e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1275,9 +1275,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.59" +version = "0.10.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" +checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -1301,9 +1301,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.95" +version = "0.9.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" +checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" dependencies = [ "cc", "libc", diff --git a/router/Cargo.toml b/router/Cargo.toml index ffdc6556e..558a598f8 100644 --- a/router/Cargo.toml +++ b/router/Cargo.toml @@ -26,7 +26,7 @@ nohash-hasher = "^0.2.0" num = "^0.4.1" num_cpus = "^1.16.0" hyper = "^0.14.27" # Override to address CVE-2023-26964 -openssl = "^0.10.59" # Override to address WS-2023-0082, WS-2023-0083, WS-2023-0195 +openssl = "^0.10.60" # Override to address WS-2023-0082, WS-2023-0083, WS-2023-0195 openssl-sys = "^0.9.95" # Override to address WS-2023-0082, WS-2023-0083, WS-2023-0195 rustls-webpki = "^0.101.7" # Override to address WS-2023-0305, CVE-2018-16875 rand = "^0.8.5"