docker image

Dockerfile

@@ -3,32 +3,32 @@ FROM node:20-alpine as builder
 COPY package*.json ./
 
 RUN apk add --no-cache python3 make g++
-RUN npm install -g pnpm
-RUN pnpm install --ignore-scripts
+
+RUN npm ci --ignore-scripts
 
 # Hardcode the target arch for now
 # ideally do something like
 # ENV TARGET_ARCH=if `uname -m` -eq "x86_64"; then echo "386"; else echo ""; fi
 ENV TARGET_ARCH="386"
-RUN pnpm rebuild bcrypto
-RUN pnpm rebuild loady
-RUN pnpm rebuild node-jq
-RUN pnpm rebuild sqlite3
+RUN npm run postinstall -prefix ./node_modules/go-ipfs
+RUN npm rebuild bcrypto
+RUN npm rebuild loady
+RUN npm rebuild node-jq
+RUN npm rebuild sqlite3
 
-FROM node:16-alpine as app
+FROM node:20-alpine as app
 
 WORKDIR /app
 
-RUN apk add --no-cache curl
+RUN apk add --no-cache curl jq
 
 COPY --from=builder node_modules ./node_modules
 
-COPY package.json pnpm-lock.yaml ceramic-config.json jest.config.json babel.config.json tsconfig.json update.sh ci/* ./
+COPY package*.json ceramic-config.json jest.config.json babel.config.json tsconfig.json ci/* ./
 COPY config ./config
 COPY src ./src
 
-RUN npm install -g pnpm
-RUN pnpm run build
+RUN npm run build
 
 # NODE_ENV must match desired config file to use for tests
 ENV NODE_ENV="private-public"

README.md

@@ -3,8 +3,8 @@
 ## Building
 
 ```
-pnpm install
-pnpm run build
+npm install
+npm run build
 ```
 
 ## Running tests
@@ -13,21 +13,21 @@ There are currently 3 different configurations that the tests can be run in, whi
 
 #### private-public
 
-`NODE_ENV=private-public pnpm run test`
+`NODE_ENV=private-public npm run test`
 
 Tests against the two nodes (called 'private' and 'public') running in our infra.  Requires no local nodes.
 
 #### local_client-public
 
-`NODE_ENV=local_client-public pnpm run test`
+`NODE_ENV=local_client-public npm run test`
 
 Tests integration between a local node and the 'public' node in our infra.
 Before running tests a ceramic node connected to the dev-unstable network
 must be running on the same machine. The tests communicate to the local node via an http-client.
 
 #### local_node-private
 
-`NODE_ENV=local_node-private pnpm run test`
+`NODE_ENV=local_node-private npm run test`
 
 Tests integration between a local node and the 'private' node in our infra.
 Before running tests an ipfs node must be running on the same machine.

ci/ci.sh

@@ -22,29 +22,29 @@ fi
 
 if [[ $NODE_ENV == "local_node-private" ]]; then
   # init config and generate peer id
-  node_modules/.pnpm/go-ipfs*/node_modules/go-ipfs/bin/ipfs init
+  node_modules/go-ipfs/go-ipfs/ipfs init
 
   # config changes to match js-ceramic/ipfs-daemon: TODO remove these and ensure still passes
-  node_modules/.pnpm/go-ipfs*/node_modules/go-ipfs/bin/ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin: "[\"*\"]"
-  node_modules/.pnpm/go-ipfs*/node_modules/go-ipfs/bin/ipfs config --json API.HTTPHeaders.Access-Control-Allow-Methods "[\"GET\", \"POST\"]"
-  node_modules/.pnpm/go-ipfs*/node_modules/go-ipfs/bin/ipfs config --json API.HTTPHeaders.Access-Control-Allow-Headers "[\"Authorization\"]"
-  node_modules/.pnpm/go-ipfs*/node_modules/go-ipfs/bin/ipfs config --json API.HTTPHeaders.Access-Control-Expose-Headers "[\"Location\"]"
-  node_modules/.pnpm/go-ipfs*/node_modules/go-ipfs/bin/ipfs config --json API.HTTPHeaders.Access-Control-Allow-Credentials "[\"true\"]"
-  node_modules/.pnpm/go-ipfs*/node_modules/go-ipfs/bin/ipfs config --json Addresses.Swarm "[\"/ip4/0.0.0.0/tcp/4011\", \"/ip4/0.0.0.0/tcp/4012/ws\"]"
-  node_modules/.pnpm/go-ipfs*/node_modules/go-ipfs/bin/ipfs config Addresses.API /ip4/0.0.0.0/tcp/5011
-  node_modules/.pnpm/go-ipfs*/node_modules/go-ipfs/bin/ipfs config Routing.Type dhtclient
+  node_modules/go-ipfs/go-ipfs/ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin: "[\"*\"]"
+  node_modules/go-ipfs/go-ipfs/ipfs config --json API.HTTPHeaders.Access-Control-Allow-Methods "[\"GET\", \"POST\"]"
+  node_modules/go-ipfs/go-ipfs/ipfs config --json API.HTTPHeaders.Access-Control-Allow-Headers "[\"Authorization\"]"
+  node_modules/go-ipfs/go-ipfs/ipfs config --json API.HTTPHeaders.Access-Control-Expose-Headers "[\"Location\"]"
+  node_modules/go-ipfs/go-ipfs/ipfs config --json API.HTTPHeaders.Access-Control-Allow-Credentials "[\"true\"]"
+  node_modules/go-ipfs/go-ipfs/ipfs config --json Addresses.Swarm "[\"/ip4/0.0.0.0/tcp/4011\", \"/ip4/0.0.0.0/tcp/4012/ws\"]"
+  node_modules/go-ipfs/go-ipfs/ipfs config Addresses.API /ip4/0.0.0.0/tcp/5011
+  node_modules/go-ipfs/go-ipfs/ipfs config Routing.Type dhtclient
 
   # start the daemon
-  node_modules/.pnpm/go-ipfs*/node_modules/go-ipfs/bin/ipfs daemon --enable-pubsub-experiment &
+  node_modules/go-ipfs/go-ipfs/ipfs daemon --enable-pubsub-experiment &
 fi
 
 echo "INFO: Sleeping for ${SLEEP}s"
 sleep ${SLEEP} # Give time for services to finish starting up before starting tests
 
 if [ "$REPORT_STATUS" = true ]; then
-  pnpm run test:ci
+  npm run test:ci
 else
-  pnpm run test
+  npm run test
 fi
 
 exit_code=$?;

update.sh → ci/update.sh

@@ -1,9 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
-cd $(dirname $0)
-
 deps=$(jq -r '.dependencies | keys | .[]' package.json)
 filtered_deps=''
 for dep in $deps
@@ -37,7 +35,7 @@ do
 done
 
 # We only care about top level dependencies.
-cmd="pnpm update --depth 0 $filtered_deps"
+cmd="npm install --ignore-scripts $filtered_deps"
 echo "$cmd"
 $cmd