From c3a4a7d3249ddb7e83cd2a63f34b9b7aed8ed6e1 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Wed, 28 Apr 2021 15:06:56 +0100 Subject: [PATCH 1/2] chore: fix docker images The python package has gone, we need to use python3 instead. There's a futher problem with npm not setting the $PATH properly so it fails as it can't find pbjs, but this is only necessary with gh dep versions which should go away with the next libp2p-kad-dht/libp2p-gossipsub releases. --- Dockerfile.latest | 6 +++--- Dockerfile.next | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile.latest b/Dockerfile.latest index aceceb7983..ae430921f1 100644 --- a/Dockerfile.latest +++ b/Dockerfile.latest @@ -5,13 +5,13 @@ ENV IPFS_MONITORING=1 ENV IPFS_PATH=/root/.jsipfs ENV BUILD_DEPS='libnspr4 libnspr4-dev libnss3' -RUN apk add --no-cache git python build-base +RUN apk add --no-cache git python3 build-base -RUN npm install --unsafe-perm -g ipfs@"$IPFS_VERSION" +RUN npm install -g ipfs@"$IPFS_VERSION" # Make the image a bit smaller RUN npm cache clear --force -RUN apk del build-base python git +RUN apk del build-base python3 git # Configure jsipfs RUN jsipfs init diff --git a/Dockerfile.next b/Dockerfile.next index 3e2ad99d48..711930e855 100644 --- a/Dockerfile.next +++ b/Dockerfile.next @@ -5,13 +5,13 @@ ENV IPFS_MONITORING=1 ENV IPFS_PATH=/root/.jsipfs ENV BUILD_DEPS='libnspr4 libnspr4-dev libnss3' -RUN apk add --no-cache git python build-base +RUN apk add --no-cache git python3 build-base -RUN npm install --unsafe-perm -g ipfs@"$IPFS_VERSION" +RUN npm install -g ipfs@"$IPFS_VERSION" # Make the image a bit smaller RUN npm cache clear --force -RUN apk del build-base python git +RUN apk del build-base python3 git # Configure jsipfs RUN jsipfs init From a6ce24d5146dfefdce3874c7f62a9952487100a1 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Wed, 28 Apr 2021 15:09:50 +0100 Subject: [PATCH 2/2] chore: revert unsafe-perms removal --- Dockerfile.latest | 2 +- Dockerfile.next | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.latest b/Dockerfile.latest index ae430921f1..085684d7fd 100644 --- a/Dockerfile.latest +++ b/Dockerfile.latest @@ -7,7 +7,7 @@ ENV BUILD_DEPS='libnspr4 libnspr4-dev libnss3' RUN apk add --no-cache git python3 build-base -RUN npm install -g ipfs@"$IPFS_VERSION" +RUN npm install --unsafe-perm -g ipfs@"$IPFS_VERSION" # Make the image a bit smaller RUN npm cache clear --force diff --git a/Dockerfile.next b/Dockerfile.next index 711930e855..2c63a9f629 100644 --- a/Dockerfile.next +++ b/Dockerfile.next @@ -7,7 +7,7 @@ ENV BUILD_DEPS='libnspr4 libnspr4-dev libnss3' RUN apk add --no-cache git python3 build-base -RUN npm install -g ipfs@"$IPFS_VERSION" +RUN npm install --unsafe-perm -g ipfs@"$IPFS_VERSION" # Make the image a bit smaller RUN npm cache clear --force