Skip to content

Commit

Permalink
Fix: ClamAV fails to complete scan (#6022)
Browse files Browse the repository at this point in the history
  • Loading branch information
dsotirho-ucsc committed Mar 13, 2024
1 parent c51bb77 commit 54725e0
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 25 deletions.
4 changes: 3 additions & 1 deletion environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,9 @@ def env() -> Mapping[str, Optional[str]]:
# Updating any of the four images below additionally requires
# redeploying the `gitlab` TF component.
'clamav': {
'ref': 'docker.io/clamav/clamav:1.3.0-41'
# FIXME: https://github.com/DataBiosphere/azul/issues/6022
# Keep CalmAV at 1.2.1 until 1.3.x failure is resolved
'ref': 'docker.io/clamav/clamav:1.2.1-27'
},
'gitlab': {
'ref': 'docker.io/gitlab/gitlab-ce:16.9.1-ce.0'
Expand Down
48 changes: 24 additions & 24 deletions image_manifests.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
{
"docker.io/library/docker:24.0.9": {
"digest": "sha256:bfca615a14787f7cc15c962b644745888a949efeae0460e2da29db20be4884bf",
"digest": "sha256:51a2a0a9f8d15d455584ea054a602ea58917a78c34df2261b0695a60f0a6ae61",
"manifests": {
"linux/amd64": {
"digest": "sha256:53ca3e4d3f8f15b32989cf657b41f2ce8d8531b3b894ac10ad65788459409420",
"id": "sha256:365b8ddc1c23c15cc09f30bc3ae8bd78fbfa816346f33faf5483397780737303",
"digest": "sha256:36186b97332b8bedd2fe6290566f51b2bd6c5d2a833c31c2c37bdbcf9486b3a3",
"id": "sha256:dc2bb1b91b323e7ce27c6dfec05fc2cb9f298aebedb61fd89ac1694e59a2f1cc",
"platform": "linux/amd64"
},
"linux/arm64": {
"digest": "sha256:d6737d3da09e6b38bb68f6f17995372440b20dfecc7428df5cee599f140492bc",
"id": "sha256:753424ef4156d4f336bab004c19f01ad2e3be5596192b92c9a718a3bc0a8c65d",
"digest": "sha256:699a2751bea943b1b6be6c79816ed6ac80829f37b384e493436551ec0787120d",
"id": "sha256:60c1f5cf8b98c87eee5aff80c3ba39686c72a534b4cfb491605b13a00534b054",
"platform": "linux/arm64"
}
}
},
"docker.io/library/python:3.11.8-bullseye": {
"digest": "sha256:a2263067985a930a9479d6ae0835d3402d9ad7862f5fcac81ee4b221b77f2245",
"digest": "sha256:5bd29274bdd04975459c397f3817956f0e013cdccaea419070a03d2a11dc899f",
"manifests": {
"linux/amd64": {
"digest": "sha256:3fae413a110d4146b6ce8edd847c99169972edfa50c0177713586a75919f3cd4",
"id": "sha256:a6892da4cf9a3064d88802450fd96bc53cf5bc812df043156f5497fd2ca9d297",
"digest": "sha256:1e78b46bd49050a8176ef2ee3897be71ee3e9d2610883de98ad955076b8365cc",
"id": "sha256:bb7e04c2081ba98bfe4a8bc0ff39037426e3770e7b3864b8d0dcbac2a7bb0a9a",
"platform": "linux/amd64"
},
"linux/arm64": {
"digest": "sha256:65c5428b66c2dca1ab1c35ae6c982281eab58ce63ee2807690221ec838572f25",
"id": "sha256:dc8302f92a480c3ce102bb8a24f5b1f7db13de1a773363d4c80b6993b9911df7",
"digest": "sha256:9b33daa086f51c7806662105836f0dcb8eb8d5dc6d1e36af25d9e3e5cfc5b0bf",
"id": "sha256:57e81b68a880cb3755a8afbf1920d7ca5565470d9ec12460c774319d8ad7a8e1",
"platform": "linux/arm64"
}
}
},
"docker.io/ucscgi/azul-pycharm:2023.3.4-15": {
"digest": "sha256:50c9923d2a2c1fedc560f6b33834786780d5664533e539810546718f9e8e3220",
"digest": "sha256:a6c2cc2003ad4b487e3edcc9b424c3a8fa6cb3de7236de26b26c105029d07f61",
"manifests": {
"linux/amd64": {
"digest": "sha256:910633642a8d244213c1be37810ecd6c88ac805ff50a5e2ab3c4e20652f50c32",
Expand All @@ -45,16 +45,16 @@
}
},
"docker.io/ucscgi/azul-elasticsearch:7.17.18-13": {
"digest": "sha256:e70754d35aa2410cefbea5e5e4970c36772f1cb936c171b2625ec2715e32c30f",
"digest": "sha256:0c7449e182fa982a7fbed85c99fd5b7e7978d7b1d772e3585488c34829d35df8",
"manifests": {
"linux/amd64": {
"digest": "sha256:8249a2f2de38ddfc668eff6f064a51c306381b4ed1e8e335a3a8bb1467bfae91",
"id": "sha256:4f818dbc8a286c11baa3291b955d9aa6fc9c9d583345d669b2530c49f7f787c5",
"digest": "sha256:2f8eefde6328db091ab33e094c4609c96a6baa64061dc1453c97de02b0002816",
"id": "sha256:823a612e3714a0b1616dc84584ad9d8f56e77bbe1eff0df67176d024694e5126",
"platform": "linux/amd64"
},
"linux/arm64": {
"digest": "sha256:cd88714ef95935983b8b1198ac2b593fe89bf97ae2420c8e4ada6e9d8eaa814b",
"id": "sha256:043ddf0a10eae880c92d822dbd244e2cd03407ed42257e3d693b40fb9f2709fa",
"digest": "sha256:ff50851ee45c0d9741359164a2599d33197036c13e4a7fb0660bb225b0919431",
"id": "sha256:4ab696efb5c175664f2a41285f053c97671df87a0370d01bb16d073efdff3de0",
"platform": "linux/arm64"
}
}
Expand All @@ -64,9 +64,9 @@
"id": "sha256:2fc698b738dd0feeab79fa175dbca3dc4cf59f7a766e16b85541327e6b3681fc",
"platform": "linux/amd64"
},
"docker.io/clamav/clamav:1.3.0-41": {
"digest": "sha256:0bb5d72ed47458c3333868c2e5835dd38f4268ceeba6e4212b3c57d809526755",
"id": "sha256:c9f71cb59795ba6a22385dd431cc8270a8215a1e50326fa293ce6895288ee08d",
"docker.io/clamav/clamav:1.2.1-27": {
"digest": "sha256:f51c38f31c6b8754191a040c9f9ffc7cb3e44c796b9a2700b3cfd33211651a6f",
"id": "sha256:b56c8c4aa940277a4dc17599b610ce55ab09d3d882fee0e3bb6ecabd2748a5ee",
"platform": "linux/amd64"
},
"docker.io/gitlab/gitlab-ce:16.9.1-ce.0": {
Expand All @@ -90,16 +90,16 @@
}
},
"docker.io/library/docker:24.0.9-dind": {
"digest": "sha256:bfca615a14787f7cc15c962b644745888a949efeae0460e2da29db20be4884bf",
"digest": "sha256:51a2a0a9f8d15d455584ea054a602ea58917a78c34df2261b0695a60f0a6ae61",
"manifests": {
"linux/amd64": {
"digest": "sha256:53ca3e4d3f8f15b32989cf657b41f2ce8d8531b3b894ac10ad65788459409420",
"id": "sha256:365b8ddc1c23c15cc09f30bc3ae8bd78fbfa816346f33faf5483397780737303",
"digest": "sha256:36186b97332b8bedd2fe6290566f51b2bd6c5d2a833c31c2c37bdbcf9486b3a3",
"id": "sha256:dc2bb1b91b323e7ce27c6dfec05fc2cb9f298aebedb61fd89ac1694e59a2f1cc",
"platform": "linux/amd64"
},
"linux/arm64": {
"digest": "sha256:d6737d3da09e6b38bb68f6f17995372440b20dfecc7428df5cee599f140492bc",
"id": "sha256:753424ef4156d4f336bab004c19f01ad2e3be5596192b92c9a718a3bc0a8c65d",
"digest": "sha256:699a2751bea943b1b6be6c79816ed6ac80829f37b384e493436551ec0787120d",
"id": "sha256:60c1f5cf8b98c87eee5aff80c3ba39686c72a534b4cfb491605b13a00534b054",
"platform": "linux/arm64"
}
}
Expand Down

0 comments on commit 54725e0

Please sign in to comment.