Skip to content

Commit

Permalink
Update MARINER.md with the prod link, fix chocolatey version to 1.4.0 (
Browse files Browse the repository at this point in the history
…#981)

* Update MARINER.md with the prod link for Mariner repo packages

* Downgrading to chocolateyVersion 1.4.0

* trivyignore add vuln

---------

Co-authored-by: Janvi Jatakia <[email protected]>
  • Loading branch information
jatakiajanvi12 and Janvi Jatakia authored Jun 2, 2023
1 parent e89e171 commit 2ab602f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .trivyignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ CVE-2023-25809
# telegraf HIGH
CVE-2023-27561
CVE-2023-28840
CVE-2023-28642
CVE-2023-28642
CVE-2023-2253
4 changes: 2 additions & 2 deletions MARINER.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Some naming conventions or package names are different for RPM packages. For exa

## Our Current Package Dependencies
* All Mariner packages are supported for both AMD64 and ARM64.
* `telegraf`, `fluent-bit`, `ruby` and `rubygem-fluentd` are built and published by the Mariner team in the [Mariner base repository](https://packages.microsoft.com/cbl-mariner/2.0/preview/base/x86_64/). [ARM64 versions](https://packages.microsoft.com/cbl-mariner/2.0/preview/base/aarch64/) are available also.
* `telegraf`, `fluent-bit` are built and published by the Mariner team in the [Mariner base repository](https://packages.microsoft.com/cbl-mariner/2.0/prod/base/x86_64/). [ARM64 versions](https://packages.microsoft.com/cbl-mariner/2.0/prod/base/aarch64/) are available also.
* `azure-mdsd` is published by their team to the Mariner extras repository. [Release notes](https://eng.ms/docs/products/geneva/collect/instrument/linux/releasenotes). The package for [Mariner 2.0](https://packages.microsoft.com/cbl-mariner/2.0/prod/extras/x86_64/) is now available.
* When updating any package, make sure to check the dependencies and add if any changes. (Avoid removing unless you are completely sure that non other packages have those dependencies as some dependencies in the list may also be used by some other package.)

Expand All @@ -76,4 +76,4 @@ If some files are missing after the `=>`, you can run these commands in a contai
In the Dockerfile in the distroless stage:
* Copy over the executable file path
* Copy over the full path of all `.so` files that have `=>`
* If not all necssary `.so` files are available, there will be an error saying that file is missing during runtime
* If not all necssary `.so` files are available, there will be an error saying that file is missing during runtime
1 change: 1 addition & 0 deletions kubernetes/windows/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ LABEL vendor=Microsoft\ Corp \

# Do not split this into multiple RUN!
# Docker creates a layer for every RUN-Statement
ENV chocolateyVersion 1.4.0
RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"
# Fluentd depends on cool.io whose fat gem is only available for Ruby < 2.5, so need to specify --platform ruby when install Ruby > 2.5 and install msys2 to get dev tools
RUN choco install -y ruby --version 3.1.1.1 --params "'/InstallDir:C:\ruby31'" \
Expand Down

0 comments on commit 2ab602f

Please sign in to comment.