diff --git a/deployments/dockerfiles/ipfs-service.Dockerfile b/deployments/dockerfiles/ipfs-service.Dockerfile index e56101a5872f61a5936e214654e4825e504d2607..b56478d96d7357e6180baa84af49d32e396945bc 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 0000000000000000000000000000000000000000..85987ea2548fba15d982ef75695852d4e5401a95 --- /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 7707279ae364f1ca9c4ecd94fdb184d3b1a3dcc9..58bc72a9bf2af9ec76c72fa7fd924f7863e09fdf 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,