Skip to content

Commit

Permalink
Chore(nginx-rock): Update the rock base, websockets version pin.
Browse files Browse the repository at this point in the history
  • Loading branch information
alithethird committed Nov 18, 2024
1 parent cf18a2d commit eb8b47d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .trivyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# pebble
CVE-2024-34156

Check notice on line 2 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-indico-nginx-2353ee71f8f0250ad0746820eab41e7d16bfac2a-_1.0_amd64.tar)

CVE-2024-34156 not present anymore, can be safely removed.
19 changes: 9 additions & 10 deletions nginx_rock/rockcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
# Copyright 2024 Canonical Ltd.
# See LICENSE file for licensing details.
package-repositories:
- type: apt
ppa: deadsnakes/ppa
priority: always

name: indico-nginx
summary: Indico nginx rock
description: Nginx OCI image for the Indico charm
version: "1.0"
base: ubuntu@22.04
build-base: ubuntu@22.04
base: ubuntu@24.04
build-base: ubuntu@24.04
license: Apache-2.0
platforms:
amd64:
Expand All @@ -27,11 +23,16 @@ parts:
organize:
nginx.conf: etc/nginx/nginx.conf
common_headers.conf: etc/nginx/common_headers.conf
nginx-prometheus-exporter:
plugin: go
build-snaps:
- go
source: https://github.com/nginxinc/nginx-prometheus-exporter
source-tag: v1.3.0
source-type: git
nginx:
stage-packages:
- nginx
stage-snaps:
- gtrkiller-nginx-prometheus-exporter/latest/edge
plugin: nil
override-build: |
craftctl default
Expand All @@ -40,8 +41,6 @@ parts:
craftctl default
mkdir run
indico-files:
build-environment:
- PARTS_PYTHON_INTERPRETER: python3.12
python-packages:
- indico==3.3.1
build-packages:
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ deps =
requests
types-PyYAML
types-requests
websockets<14.0 # https://github.com/juju/python-libjuju/issues/1184
-r{toxinidir}/requirements.txt
commands =
codespell {[vars]plugins_path} --skip {toxinidir}/.git --skip {toxinidir}/.tox \
Expand Down Expand Up @@ -154,6 +155,7 @@ deps =
pytest
pytest-asyncio
pytest-operator
websockets<14.0 # https://github.com/juju/python-libjuju/issues/1184
-r{toxinidir}/requirements.txt
commands =
pytest -v --tb native --ignore={[vars]tst_path}unit --log-cli-level=INFO -s {posargs}
Expand Down

0 comments on commit eb8b47d

Please sign in to comment.