100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
CI/CD: Update backup script for latest postgres image (#1016)
Rich Turnerac5a3338b0b8
diff --git a/.ci_cd/host_init/backup.sh b/.ci_cd/host_init/backup.shindex 013c72792..0fcc34e0a 100644--- a/.ci_cd/host_init/backup.sh+++ b/.ci_cd/host_init/backup.sh@@ -5,5 +5,5 @@# -----------------------------------------------------------------------------------------------------echo "Backing up postgresql-data volume using pg_dump"mkdir -p /deployment.local/backup &>/dev/null-docker exec or-postgresql-1 ash -c "pg_dump -Fc openremote > /or_postgresql-data.bak"-docker cp or-postgresql-1:/or_postgresql-data.bak /deployment.local/backup+docker exec or-postgresql-1 pg_dump -Fc openremote -f /tmp/or_postgresql-data.bak+docker cp or-postgresql-1:/tmp/or_postgresql-data.bak /deployment.local/backupdiff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.javaindex 0b53791fd..95a03ee83 100644--- a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java@@ -306,23 +306,19 @@ public class PersistenceService implements ContainerService, Consumer<Persistencif (!Files.exists(storageDir)) {Files.createDirectories(storageDir);- if (!storageDir.toFile().setWritable(true, false)) {- String msg = "Specified OR_STORAGE_DIR '" + storageDir.toAbsolutePath() + "' doesn't exist and cannot be created";- LOG.log(Level.SEVERE, msg);- throw new FileSystemNotFoundException(msg);- }- } else {- if (!Files.isDirectory(storageDir)) {- String msg = "Specified OR_STORAGE_DIR '" + storageDir.toAbsolutePath() + "' is not a folder";- LOG.log(Level.SEVERE, msg);- throw new FileSystemNotFoundException(msg);- }- File testFile = storageDir.toFile();- if (!testFile.canRead() || !testFile.canWrite()) {- String msg = "Specified OR_STORAGE_DIR '" + storageDir.toAbsolutePath() + "' is not writable";- LOG.log(Level.SEVERE, msg);- throw new FileSystemNotFoundException(msg);- }+ }++ if (!Files.isDirectory(storageDir)) {+ String msg = "Specified OR_STORAGE_DIR '" + storageDir.toAbsolutePath() + "' is not a folder";+ LOG.log(Level.SEVERE, msg);+ throw new FileSystemNotFoundException(msg);+ }++ File testFile = storageDir.toFile();+ if (!testFile.canRead() || !testFile.canWrite()) {+ String msg = "Specified OR_STORAGE_DIR '" + storageDir.toAbsolutePath() + "' is not writable";+ LOG.log(Level.SEVERE, msg);+ throw new FileSystemNotFoundException(msg);}openDatabase(container, database, dbUsername, dbPassword, connectionUrl);diff --git a/container/src/main/java/org/openremote/container/web/WebTargetBuilder.java b/container/src/main/java/org/openremote/container/web/WebTargetBuilder.javaindex 0c9c55f3d..5ac06ffdd 100644--- a/container/src/main/java/org/openremote/container/web/WebTargetBuilder.java+++ b/container/src/main/java/org/openremote/container/web/WebTargetBuilder.java@@ -19,24 +19,23 @@*/package org.openremote.container.web;+import jakarta.ws.rs.Priorities;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.MultivaluedHashMap;+import jakarta.ws.rs.core.MultivaluedMap;+import jakarta.ws.rs.core.Response;import org.apache.http.client.HttpClient;import org.apache.http.client.config.CookieSpecs;import org.apache.http.client.config.RequestConfig;import org.apache.http.impl.client.HttpClientBuilder;-import org.jboss.resteasy.client.jaxrs.internal.BasicAuthentication;import org.jboss.resteasy.client.jaxrs.ResteasyClient;-import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient43Engine;+import org.jboss.resteasy.client.jaxrs.internal.BasicAuthentication;import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl;import org.openremote.container.json.JacksonConfig;import org.openremote.model.auth.OAuthGrant;-import jakarta.ws.rs.Priorities;-import jakarta.ws.rs.client.WebTarget;-import jakarta.ws.rs.core.MultivaluedHashMap;-import jakarta.ws.rs.core.MultivaluedMap;-import jakarta.ws.rs.core.Response;import java.net.URI;import java.util.*;import java.util.concurrent.ExecutorService;@@ -180,7 +179,7 @@ public class WebTargetBuilder {return createClient(executorService, CONNECTION_POOL_SIZE, CONNECTION_TIMEOUT_MILLISECONDS, null);}- public static ResteasyClient createClient(ExecutorService executorService, int connectionPoolSize, long overrideSocketTimeout, UnaryOperator<ResteasyClientBuilder> builderConfigurator) {+ public static ResteasyClient createClient(ExecutorService executorService, int connectionPoolSize, long overrideSocketTimeout, UnaryOperator<ResteasyClientBuilderImpl> builderConfigurator) {//Create all of this config code in order to deal with expires cookies in responsesRequestConfig requestConfig = RequestConfig.custom()@@ -194,7 +193,7 @@ public class WebTargetBuilder {.build();ApacheHttpClient43Engine engine = new ApacheHttpClient43Engine(apacheClient);- ResteasyClientBuilder clientBuilder = new ResteasyClientBuilderImpl()+ ResteasyClientBuilderImpl clientBuilder = new ResteasyClientBuilderImpl().httpEngine(engine).connectionPoolSize(connectionPoolSize).connectionCheckoutTimeout(CONNECTION_CHECKOUT_TIMEOUT_MILLISECONDS, TimeUnit.MILLISECONDS)