Skip to content

Commit

Permalink
chore(deps): update all non-major dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] authored Sep 12, 2024
1 parent 9569d70 commit 64cad63
Show file tree
Hide file tree
Showing 16 changed files with 114 additions and 112 deletions.
2 changes: 1 addition & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.6.15-slim-buster AS build
FROM python:3.11.4-slim-buster AS build

Check failure

Code scanning / Trivy

Image user should not be 'root' High

Artifact: backend/Dockerfile
Type: dockerfile
Vulnerability DS002
Severity: HIGH
Message: Specify at least 1 USER command in Dockerfile with non-root user as argument
Link: DS002

Check notice

Code scanning / Trivy

No HEALTHCHECK defined Low

Artifact: backend/Dockerfile
Type: dockerfile
Vulnerability DS026
Severity: LOW
Message: Add HEALTHCHECK instruction in your Dockerfile
Link: DS026

RUN apt-get -y update && apt-get -y install \
git \
Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile.old
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/rhscl/python-36-rhel7:1
FROM registry.access.redhat.com/rhscl/python-36-rhel7:1-77

Check notice

Code scanning / Trivy

No HEALTHCHECK defined Low

Artifact: backend/Dockerfile.old
Type: dockerfile
Vulnerability DS026
Severity: LOW
Message: Add HEALTHCHECK instruction in your Dockerfile
Link: DS026


# Switch to root user
Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile.rhel7
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/rhscl/python-36-rhel7:1-21
FROM registry.access.redhat.com/rhscl/python-36-rhel7:1-77

Check notice

Code scanning / Trivy

No HEALTHCHECK defined Low

Artifact: backend/Dockerfile.rhel7
Type: dockerfile
Vulnerability DS026
Severity: LOW
Message: Add HEALTHCHECK instruction in your Dockerfile
Link: DS026

USER root

Expand Down
26 changes: 13 additions & 13 deletions backend/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@ django>=2.2,<2.3
django-debug-toolbar>=1.7
gunicorn==19.9.0
gevent==1.2.2
psycopg2-binary>=2.7.1,<2.9
psycopg2-binary>=2.9.9,<2.10
whitenoise>=4.1.2
django-crispy-forms>=1.6.1
django-formtools>=2.0
django-settings-export>=1.2.1
djangorestframework>=3.11.2,<3.12
django-rest-multiple-models==2.1.0
django-rest-multiple-models==2.1.3
requests==2.21.0
minio==7.1.16
minio==7.2.8
coverage>=4.4.2
django-filter>=2.0.0,<2.1
drf-yasg==1.21.7
django-cors-headers==2.2.0
django-extensions==2.0.6
django-cors-headers==2.5.3
django-extensions==2.2.9
cryptography<=40.0.2
django-reversion==2.0.13
openpyxl==2.5.11
openpyxl==2.6.4
lxml==4.6.3
GDAL>=2.4,<3.0
deepdiff>=4
urllib3>=1.24,<1.25
djangorestframework-csv==2.1.0
geojson==2.4.1
djangorestframework-csv==2.1.1
geojson==2.5.0
MarkupSafe>=2.0.1
djangorestframework-simplejwt==4.4.0
pyjwt>=2.0,<=2.4.0
thefuzz==0.19.0
geopandas==0.9.0
pyproj==3.0.1
djangorestframework-simplejwt==4.8.0
pyjwt>=2.9,<=2.9.0
thefuzz==0.22.1
geopandas==0.14.4
pyproj==3.6.1
6 changes: 3 additions & 3 deletions charts/app/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 15.5.20
digest: sha256:5541bc21c61e9def6fce9eaca5e298512248a3e0b07c89d724449f982375500b
generated: "2024-07-25T10:17:28.844013763Z"
version: 15.5.28
digest: sha256:d079c8ed8e238113bced3f5451820e3be68c5bb055f188c5a66bfdd9e6c7023b
generated: "2024-09-12T07:27:59.553333541Z"
2 changes: 1 addition & 1 deletion charts/app/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ appVersion: "1.16.0"
dependencies:
- name: postgresql
condition: bitnami-pg.enabled
version: 15.5.20
version: 15.5.28
repository: https://charts.bitnami.com/bitnami
alias: bitnami-pg
maintainers:
Expand Down
2 changes: 1 addition & 1 deletion charts/app/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ bitnami-pg:
image:
registry: ghcr.io
repository: bcgov/nr-containers/bitnami/postgresql
tag: 15.7.0
tag: 15.8.0
auth:
existingSecret: '{{ .Release.Name }}-database'
username: 'quickstart'
Expand Down
4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@vue/cli-plugin-unit-jest": "^3.7.0",
"@vue/cli-service": "^3.7.0",
"@vue/eslint-config-standard": "^4.0.0",
"@vue/test-utils": "1.0.0-beta.29",
"@vue/test-utils": "1.3.6",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^23.6.0",
Expand All @@ -60,6 +60,6 @@
},
"engines": {
"node": "14.21.3",
"npm": "10.8.2"
"npm": "10.8.3"
}
}
2 changes: 1 addition & 1 deletion gwells/openshift/ocp4/jenkins/basic/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/ubi8/ubi:8.7
FROM registry.access.redhat.com/ubi8/ubi:8.10

Check notice

Code scanning / Trivy

No HEALTHCHECK defined Low

Artifact: gwells/openshift/ocp4/jenkins/basic/docker/Dockerfile
Type: dockerfile
Vulnerability DS026
Severity: LOW
Message: Add HEALTHCHECK instruction in your Dockerfile
Link: DS026

# https://blog.csanchez.org/2017/05/31/running-a-jvm-in-a-container-without-getting-killed/
ENV JENKINS_VERSION=2.387.1 \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
jquery3-api:3.6.1-2
jquery3-api:3.7.1-2
plugin-util-api:2.20.0
snakeyaml-api:1.33-95.va_b_a_e3e47b_fa_4
trilead-api:2.84.v72119de229b_7
display-url-api:2.3.7
trilead-api:2.147.vb_73cc728a_32e
display-url-api:2.204.vf6fddd8a_8b_e9
durable-task:504.vb10d1ae5ba2f
jackson2-api:2.14.2-319.v37853346a_229
jackson2-api:2.17.0-379.v02de8ec9f64c
jdk-tool:63.v62d2fd4b_4793
jenkins-design-language:1.27.3
jenkins-design-language:1.27.14
mailer:448.v5b_97805e3767
okhttp-api:4.10.0-132.v7a_7b_91cef39c
pubsub-light:1.17
okhttp-api:4.11.0-181.v1de5b_83857df
pubsub-light:1.18
script-security:1229.v4880b_b_e905a_6
simple-theme-plugin:146.v0e67db_a_9052e
sse-gateway:1.26
sse-gateway:1.27
structs:324.va_f5d6774f3a_d
swarm:3.39
swarm:3.47
workflow-step-api:639.v6eca_cd8c04a_a_
blueocean-commons:1.27.3
blueocean-core-js:1.27.3
blueocean-jwt:1.27.3
blueocean-rest:1.27.3
blueocean-commons:1.27.14
blueocean-core-js:1.27.14
blueocean-jwt:1.27.14
blueocean-rest:1.27.14
command-launcher:90.v669d7ccb_7c31
credentials:1189.vf61b_a_5e2f62e
echarts-api:4.8.0-2
github-api:1.303-417.ve35d9dd78549
monitoring:1.92.0
pipeline-model-api:2.2125.vddb_a_44a_d605e
echarts-api:4.9.0-4
github-api:1.321-478.vc9ce627ce001
monitoring:1.99.0
pipeline-model-api:2.2214.vb_b_34b_2ea_9b_83
plain-credentials:143.v1b_df8b_d3b_e48
scm-api:631.v9143df5b_e4a_a
ssh-credentials:305.v8f4381501156
Expand All @@ -34,78 +34,78 @@ variant:59.vf075fe829ccb
workflow-api:1208.v0cc7c6e0da_9e
workflow-scm-step:408.v7d5b_135a_b_d49
workflow-support:839.v35e2736cfd5c
ansicolor:1.0.2
apache-httpcomponents-client-4-api:4.5.14-150.v7a_b_9d17134a_5
authentication-tokens:1.4
blueocean-i18n:1.27.3
blueocean-web:1.27.3
bouncycastle-api:2.27
cloudbees-folder:6.758.vfd75d09eea_a_1
credentials-binding:523.vd859a_4b_122e6
generic-webhook-trigger:1.86.2
ansicolor:1.0.4
apache-httpcomponents-client-4-api:4.5.14-208.v438351942757
authentication-tokens:1.119.v50285141b_7e1
blueocean-i18n:1.27.14
blueocean-web:1.27.14
bouncycastle-api:2.30.1.78.1-248.ve27176eb_46cb_
cloudbees-folder:6.942.vb_43318a_156b_2
credentials-binding:523.525.vb_72269281873
generic-webhook-trigger:1.88.3
pipeline-groovy-lib:629.vb_5627b_ee2104
groovy:453.vcdb_a_c5c99890
handy-uri-templates-2-api:2.1.8-22.v77d5b_75e6953
jsch:0.1.55.61.va_e9ee26616e7
handy-uri-templates-2-api:2.1.8-30.v7e777411b_148
jsch:0.2.16-86.v42e010d9484b_
junit:1189.v1b_e593637fa_e
kubernetes-client-api:6.4.1-215.v2ed17097a_8e9
matrix-auth:3.1.6
kubernetes-client-api:6.10.0-240.v57880ce8b_0b_2
matrix-auth:3.2.2
matrix-project:785.v06b_7f47b_c631
mercurial:1260.vdfb_723cdcc81
openshift-login:1.0.29
openshift-login:1.1.0.248.v1908df5c4f5e
pipeline-build-step:487.va_823138eee8b_
pipeline-input-step:466.v6d0a_5df34f81
pipeline-milestone-step:111.v449306f708b_7
pipeline-stage-step:305.ve96d0205c1c6
pipeline-stage-tags-metadata:2.2125.vddb_a_44a_d605e
pipeline-stage-tags-metadata:2.2214.vb_b_34b_2ea_9b_83
rebuild:1.34
timestamper:1.23
workflow-durable-task-step:2.35
workflow-job:1289.vd1c337fd5354
authorize-project:1.5.1
blueocean-config:1.27.3
blueocean-dashboard:1.27.3
blueocean-personalization:1.27.3
branch-api:2.1071.v1a_188a_562481
favorite:2.4.1
git-client:4.2.0
git-server:99.va_0826a_b_cdfa_d
htmlpublisher:1.31
jira:3.9
timestamper:1.27
workflow-durable-task-step:2.40
workflow-job:1289.1291.vb_7c188e7e7df
authorize-project:1.7.2
blueocean-config:1.27.14
blueocean-dashboard:1.27.14
blueocean-personalization:1.27.14
branch-api:2.1178.v969d9eb_c728e
favorite:2.221.v19ca_666b_62f5
git-client:4.7.0
git-server:99.101.v720e86326c09
htmlpublisher:1.36
jira:3.13
lockable-resources:1131.vb_7c3d377e723
startup-trigger-plugin:2.9.3
workflow-basic-steps:2.20
startup-trigger-plugin:2.9.4
workflow-basic-steps:2.24
workflow-cps:3653.v07ea_433c90b_4
workflow-multibranch:733.v109046189126
basic-branch-build-strategies:71.vc1421f89888e
blueocean-display-url:2.4.1
blueocean-jira:1.23.2
blueocean-pipeline-scm-api:1.27.3
blueocean-rest-impl:1.27.3
git:5.0.0
github:1.37.0
blueocean-display-url:2.4.3
blueocean-jira:1.27.14
blueocean-pipeline-scm-api:1.27.14
blueocean-rest-impl:1.27.14
git:5.4.1
github:1.40.0
github-branch-source:1703.vd5a_2b_29c6cdc
openshift-client:1.0.38
openshift-client:1.1.0.424.v829cb_ccf8798
pipeline-graph-analysis:202.va_d268e64deb_3
pipeline-model-extensions:2.2125.vddb_a_44a_d605e
pipeline-rest-api:2.32
pipeline-stage-view:2.32
pipeline-model-extensions:2.2214.vb_b_34b_2ea_9b_83
pipeline-rest-api:2.34
pipeline-stage-view:2.34
blueocean-autofavorite:1.2.5
cloudbees-bitbucket-branch-source:800.va_b_b_9a_a_5035c1
disable-github-multibranch-status:1.2
docker-commons:419.v8e3cd84ef49c
docker-workflow:1.24
kubernetes-credentials:0.10.0
pipeline-model-definition:2.2125.vddb_a_44a_d605e
workflow-aggregator:2.6
blueocean-pipeline-api-impl:1.23.2
blueocean-pipeline-editor:1.23.2
kubernetes:3900.va_dce992317b_4
blueocean-bitbucket-pipeline:1.23.2
blueocean-events:1.23.2
blueocean-git-pipeline:1.23.2
blueocean-github-pipeline:1.23.2
blueocean:1.27.3
docker-workflow:1.29
kubernetes-credentials:0.11
pipeline-model-definition:2.2214.vb_b_34b_2ea_9b_83
workflow-aggregator:2.7
blueocean-pipeline-api-impl:1.27.14
blueocean-pipeline-editor:1.27.14
kubernetes:3900.3902.v10b_836a_c8c15
blueocean-bitbucket-pipeline:1.27.14
blueocean-events:1.27.14
blueocean-git-pipeline:1.27.14
blueocean-github-pipeline:1.27.14
blueocean:1.27.14
configuration-as-code:1616.v11393eccf675
role-strategy:587.588.v850a_20a_30162
oic-auth:2.5
oic-auth:2.6
2 changes: 1 addition & 1 deletion gwells/openshift/sonar-runner/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ test {
}

dependencies {
testCompile 'junit:junit:4.12'
testCompile 'junit:junit:4.13.2'
}

repositories {
Expand Down
Binary file modified gwells/openshift/sonar-runner/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Tue Sep 20 22:02:53 BST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
23 changes: 13 additions & 10 deletions gwells/openshift/sonar-runner/gradlew
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env sh

##############################################################################
##
Expand Down Expand Up @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand Down Expand Up @@ -154,16 +154,19 @@ if $cygwin ; then
esac
fi

# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
APP_ARGS=$(save "$@")

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
exec "$JAVACMD" "$@"
6 changes: 3 additions & 3 deletions scripts/profanitysearch/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
inflection==0.5.0
inflection==0.5.1
joblib==0.15.1
numpy==1.18.5
profanity-check==1.0.3
profanityfilter==2.0.6
scikit-learn==0.22.2.post1
scipy==1.4.1
threadpoolctl==2.1.0
scipy==1.14.1
threadpoolctl==2.2.0
4 changes: 2 additions & 2 deletions scripts/qaqc/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ requests>=2.26
rasterio
geopandas>=0.10
jupyterlab>=3.2.1
python-levenshtein==0.12.2
thefuzz==0.19.0
python-levenshtein==0.25.1
thefuzz==0.22.1
bcdata>=0.4.5

0 comments on commit 64cad63

Please sign in to comment.