From ebae8d3876e133da02adc7e19bad5e95cc501fd3 Mon Sep 17 00:00:00 2001
From: Johannes Buechele <johannes@bujo.at>
Date: Thu, 18 Jul 2024 16:17:30 +0200
Subject: [PATCH] fixed ipfs, added ssh tunnel
---
deployments/dockerfiles/ipfs-service.Dockerfile | 7 +++++++
deployments/scripts/setup-ssh-tunnel.sh | 8 ++++++++
.../ipfs_service/service/IpfsClusterService.java | 2 +-
3 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 deployments/scripts/setup-ssh-tunnel.sh
diff --git a/deployments/dockerfiles/ipfs-service.Dockerfile b/deployments/dockerfiles/ipfs-service.Dockerfile
index e56101a..b56478d 100644
--- a/deployments/dockerfiles/ipfs-service.Dockerfile
+++ b/deployments/dockerfiles/ipfs-service.Dockerfile
@@ -4,6 +4,13 @@ COPY ./faircommons-services .
RUN mvn clean package
FROM sapmachine:21-jre-headless-ubuntu
+# Install SSH client
+RUN apt-get update && apt-get install -y openssh-client && rm -rf /var/lib/apt/lists/*
+
WORKDIR /app
+
+COPY ./deployments/scripts/setup-ssh-tunnel.sh ./setup-ssh-tunnel.sh
+RUN chmod +x ./setup-ssh-tunnel.sh
+
COPY --from=builder /app/ipfs-service/target/ipfs-service*.jar ./ipfs-service.jar
ENTRYPOINT ["java","-jar","./ipfs-service.jar"]
\ No newline at end of file
diff --git a/deployments/scripts/setup-ssh-tunnel.sh b/deployments/scripts/setup-ssh-tunnel.sh
new file mode 100644
index 0000000..85987ea
--- /dev/null
+++ b/deployments/scripts/setup-ssh-tunnel.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+SSH_KEY_PATH=/root/.ssh/ssh-privatekey
+REMOTE_USER=ipfs
+REMOTE_HOST=157.90.125.62
+LOCAL_PORT=9094
+REMOTE_PORT=9094
+SSH_PORT=3345
+ssh -i $SSH_KEY_PATH -f -N -L $LOCAL_PORT:localhost:$REMOTE_PORT $REMOTE_USER@$REMOTE_HOST -p $SSH_PORT &
diff --git a/faircommons-services/ipfs-service/src/main/java/eu/fairkom/faircommons/ipfs_service/service/IpfsClusterService.java b/faircommons-services/ipfs-service/src/main/java/eu/fairkom/faircommons/ipfs_service/service/IpfsClusterService.java
index 7707279..58bc72a 100644
--- a/faircommons-services/ipfs-service/src/main/java/eu/fairkom/faircommons/ipfs_service/service/IpfsClusterService.java
+++ b/faircommons-services/ipfs-service/src/main/java/eu/fairkom/faircommons/ipfs_service/service/IpfsClusterService.java
@@ -22,7 +22,7 @@ import java.util.Objects;
@ConditionalOnProperty(prefix = "ipfs", name = "service", havingValue = "cluster")
public class IpfsClusterService implements IpfsService {
private static final Logger logger = LoggerFactory.getLogger(IpfsClusterService.class);
- private static final String UPLOAD_ENDPOINT = "/add?pin=true";
+ private static final String UPLOAD_ENDPOINT = "/add?local=true&pin=true";
private final RestTemplate restTemplate;
public IpfsClusterService(RestTemplateBuilder restTemplateBuilder,
--
GitLab