Optional VectorRS is gone

This commit is contained in:
Johannes Zellner
2024-03-01 13:37:41 +01:00
parent 35c5f19eac
commit eadc4fda30
5 changed files with 1 additions and 23 deletions

View File

@@ -30,15 +30,6 @@
<p ng-bind-html="'services.configure.recoveryModeDescription' | tr:{ docsLink: 'https://docs.cloudron.io/troubleshooting/#unresponsive-service' }"></p>
</div>
<div class="form-group" ng-show="serviceConfigure.service.name === 'postgresql'">
<br>
<div class="checkbox">
<label>
<input type="checkbox" ng-model="serviceConfigure.useVectorRsExtension"><b>Run PostgreSQL with VectorRS extension</b></input>
</label>
</div>
</div>
<input class="ng-hide" type="submit" ng-disabled="serviceConfigureForm.$invalid || serviceConfigure.busy"/>
</fieldset>
</form>

View File

@@ -70,7 +70,6 @@ angular.module('Application').controller('ServicesController', ['$scope', '$loca
memoryTicks: [],
recoveryMode: false,
useVectorRsExtension: false,
show: function (service) {
$scope.serviceConfigure.reset();
@@ -78,7 +77,6 @@ angular.module('Application').controller('ServicesController', ['$scope', '$loca
$scope.serviceConfigure.service = service;
$scope.serviceConfigure.memoryLimit = service.config.memoryLimit;
$scope.serviceConfigure.recoveryMode = !!service.config.recoveryMode;
$scope.serviceConfigure.useVectorRsExtension = !!service.config.useVectorRsExtension;
$scope.serviceConfigure.memoryTicks = [];
@@ -102,8 +100,6 @@ angular.module('Application').controller('ServicesController', ['$scope', '$loca
recoveryMode: $scope.serviceConfigure.recoveryMode
};
if ($scope.serviceConfigure.service.name === 'postgresql') data.useVectorRsExtension = $scope.serviceConfigure.useVectorRsExtension;
Client.configureService($scope.serviceConfigure.service.name, data, function (error) {
$scope.serviceConfigure.busy = false;
if (error) {

View File

@@ -16,7 +16,7 @@ exports = module.exports = {
'mail': 'registry.docker.com/cloudron/mail:3.12.1@sha256:f539bea6c7360d3c0aa604323847172359593f109b304bb2d2c5152ca56be05c',
'mongodb': 'registry.docker.com/cloudron/mongodb:6.0.0@sha256:1108319805acfb66115aa96a8fdbf2cded28d46da0e04d171a87ec734b453d1e',
'mysql': 'registry.docker.com/cloudron/mysql:3.4.2@sha256:379749708186a89f4ae09d6b23b58bc6d99a2005bac32e812b4b1dafa47071e4',
'postgresql': 'registry.docker.com/cloudron/postgresql:5.1.8@sha256:ecfd6d79f4529a1eb0edb50f9e5fac0450b9adc822d5c9f3dd1491c451316eef',
'postgresql': 'registry.docker.com/cloudron/postgresql:5.1.9@sha256:a4b45acdda32502d6ca445b86b59db4832c20c9ff3163dedb49dcd615ca3e1c8',
'redis': 'registry.docker.com/cloudron/redis:3.5.2@sha256:5c3d9a912d3ad723b195cfcbe9f44956a2aa88f9e29f7da3ef725162f8e2829a',
'sftp': 'registry.docker.com/cloudron/sftp:3.8.5@sha256:6e7cc4218618b27a86c5b862ddd20a22c2c98b7537bd542ebd68cddaf02c0845',
'turn': 'registry.docker.com/cloudron/turn:1.7.2@sha256:9ed8da613c1edc5cb8700657cf6e49f0f285b446222a8f459f80919945352f6d',

View File

@@ -51,11 +51,6 @@ async function configure(req, res, next) {
recoveryMode: req.body.recoveryMode || false
};
if (req.params.service === 'postgresql') {
if ('useVectorRsExtension' in req.body && typeof req.body.useVectorRsExtension !== 'boolean') return next(new HttpError(400, 'useVectorRsExtension must be boolean'));
data.useVectorRsExtension = !!req.body.useVectorRsExtension;
}
const [error] = await safe(services.configureService(req.params.service, data, AuditSource.fromRequest(req)));
if (error) return next(BoxError.toHttpError(error));

View File

@@ -427,8 +427,6 @@ async function configureService(id, data, auditSource) {
const servicesConfig = await getConfig();
needsRebuild = servicesConfig[name]?.recoveryMode != data.recoveryMode; // intentional != since 'recoveryMode' may or may not be there
if (name === 'postgresql' && (!servicesConfig[name] || data.useVectorRsExtension !== servicesConfig[name].useVectorRsExtension)) needsRebuild = true;
servicesConfig[name] = data;
await settings.setJson(settings.SERVICES_CONFIG_KEY, servicesConfig);
@@ -1362,7 +1360,6 @@ async function startPostgresql(existingInfra) {
const serviceConfig = await getServiceConfig('postgresql');
const readOnly = !serviceConfig.recoveryMode ? '--read-only' : '';
const cmd = serviceConfig.recoveryMode ? '/bin/bash -c \'echo "Debug mode. Sleeping" && sleep infinity\'' : '';
const useVectorRsExtension = !!serviceConfig.useVectorRsExtension;
// memory options are applied dynamically. import requires all the memory we can get
const runCmd = `docker run --restart=always -d --name=postgresql \
@@ -1379,7 +1376,6 @@ async function startPostgresql(existingInfra) {
--shm-size=128M \
-e CLOUDRON_POSTGRESQL_ROOT_PASSWORD=${rootPassword} \
-e CLOUDRON_POSTGRESQL_TOKEN=${cloudronToken} \
-e CLOUDRON_POSTGRESQL_USE_VECTOR_RS=${ useVectorRsExtension ? 'true': '' } \
-v ${dataDir}/postgresql:/var/lib/postgresql \
--label isCloudronManaged=true \
${readOnly} -v /tmp -v /run ${image} ${cmd}`;