Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Release v1.7.5



## Release v1.7.4


Expand Down
2 changes: 1 addition & 1 deletion cass-editor
2 changes: 1 addition & 1 deletion docker-compose-test.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
elasticsearch-cass:
image: docker.elastic.co/elasticsearch/elasticsearch:9.4.2
image: docker.elastic.co/elasticsearch/elasticsearch:9.4.5
container_name: elasticsearch-cass
networks:
- testnet
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ services:
depends_on:
- elasticsearch-cass
elasticsearch-cass:
image: docker.elastic.co/elasticsearch/elasticsearch:9.4.2
image: docker.elastic.co/elasticsearch/elasticsearch:9.4.5
container_name: elasticsearch-cass
networks:
- esnet
Expand Down
4 changes: 2 additions & 2 deletions docker/standalone/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# RPM on purpose: the RPM declares a dependency on python3, which drags Python
# and its transitive libraries into the image (the single largest cluster of OS
# CVEs here) even though CaSS has no native modules and never needs node-gyp.
FROM docker.elastic.co/elasticsearch/elasticsearch:9.5.0 AS build-deps
FROM docker.elastic.co/elasticsearch/elasticsearch:9.4.5 AS build-deps
USER root
RUN microdnf install -y --nodocs gcc make perl-core zlib-devel tar xz diffutils && microdnf clean all
RUN cd /usr/local/src && curl -fsSLO https://www.openssl.org/source/openssl-3.1.2.tar.gz && tar xf openssl-3.1.2.tar.gz && cd openssl-3.1.2 && ./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib enable-fips && make -j8 > make.log && make install > makeinstall.log && make install_ssldirs > makeinstallssldirs.log && make install_fips > makeinstallfips.log
Expand All @@ -30,7 +30,7 @@ RUN case "$TARGETARCH" in \
&& tar -xJf "node-${NODE_VERSION}-linux-${NARCH}.tar.xz" -C /opt/node --strip-components=1 \
&& rm -f node-*.tar.xz SHASUMS256.txt

FROM docker.elastic.co/elasticsearch/elasticsearch:9.5.0
FROM docker.elastic.co/elasticsearch/elasticsearch:9.4.5

USER root
# Apply base-image security updates before the package manager is removed below.
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cass",
"version": "1.7.4",
"version": "1.7.5",
"description": "Competency and Skills System",
"main": "src/main/server.js",
"scripts": {
Expand Down
3 changes: 0 additions & 3 deletions src/main/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ global.fetch = async function (url, options) {
return originalFetch(url, options);
}

// Undici 8.x's fetch doesn't recognize native FormData. Must load before cassproject.
require('./server/shims/undici-compat');

let startupDt = new Date();
global.auditLogger = require('./server/shims/auditLogger.js');
const express = require('express');
Expand Down
2 changes: 0 additions & 2 deletions src/main/server/profile/worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
const https = require('https');

let app;
// Undici 8.x's fetch doesn't recognize native FormData. Must load before cassproject.
require('../shims/undici-compat');
require("cassproject");

const hashModuleRoot = require("node-object-hash");
Expand Down
82 changes: 0 additions & 82 deletions src/main/server/shims/undici-compat.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"openapi": "3.0.0",
"info": {
"title": "CaSS",
"version": "1.7.4"
"version": "1.7.5"
},
"security": [
{
Expand Down
Loading