Skip to content

Commit

Permalink
Merge pull request #119 from gisaia/feat/26.0.0
Browse files Browse the repository at this point in the history
Bump to arlas-server 26.0.0
  • Loading branch information
MohamedHamouGisaia authored Aug 30, 2024
2 parents a5dc842 + d63eb7e commit e6cdf1d
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 6 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/.trivyignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# update org.yaml:snakeyaml to 2.0
CVE-2022-1471
CVE-2023-6378
CVE-2023-6481
CVE-2023-6481
CVE-2023-52425
CVE-2023-25193
CVE-2023-45853
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
image-ref: 'docker.io/gisaia/arlas-tagger:${{ github.sha }}'
format: 'table'
exit-code: '1'
ignore-unfixed: true
ignore-unfixed: false
vuln-type: 'os,library'
severity: 'CRITICAL,HIGH'
trivyignores: .github/workflows/.trivyignore
2 changes: 1 addition & 1 deletion docker/docker-files/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN mvn install \
###################
# PACKAGING STAGE #
###################
FROM gisaia/arlas-openjdk-17-distroless:20240505183515
FROM gisaia/arlas-openjdk-17-distroless:20240821142139

# application placed into /opt/app
WORKDIR /opt/app
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-files/docker-compose-arlas-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'

services:
arlas-server:
image: gisaia/arlas-server:${ARLAS_VERSION:-25.1.0}
image: gisaia/arlas-server:${ARLAS_VERSION:-26.0.0}
container_name: arlas-server
restart: always
environment:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<surefire.version>2.22.2</surefire.version>
<log4j.version>2.23.1</log4j.version>

<arlas-server.version>25.1.0</arlas-server.version>
<arlas-server.version>26.0.0</arlas-server.version>
<!-- KAFKA-->
<kafka.version>3.7.0</kafka.version>

Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/tests-integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -o errexit -o pipefail

export ELASTIC_VERSION="8.13.3"
export ARLAS_VERSION="25.1.0"
export ARLAS_VERSION="26.0.0"

function clean_exit {
ARG=$?
Expand Down

0 comments on commit e6cdf1d

Please sign in to comment.