From 8758e374b968f584a64923e938d5f54bbadca010 Mon Sep 17 00:00:00 2001 From: Marcin Rataj Date: Sat, 4 Feb 2023 00:52:40 +0100 Subject: [PATCH] chore: switch to ipfs/kubo docker image We are still dual publishing, but it is safer to use the new name. --- .github/workflows/tests.yml | 4 ++-- Dockerfile-bundle | 8 ++++---- Dockerfile-test | 4 ++-- README.md | 2 +- docker-compose.yml | 8 ++++---- sharness/lib/test-lib.sh | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2c1c4d78..f2d3d239 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -163,8 +163,8 @@ jobs: - name: Make install run: make install - - name: Pull go-ipfs - run: docker pull ipfs/go-ipfs + - name: Pull kubo + run: docker pull ipfs/kubo - name: Sharness run: make test_sharness diff --git a/Dockerfile-bundle b/Dockerfile-bundle index 6ddaa483..83051ca3 100644 --- a/Dockerfile-bundle +++ b/Dockerfile-bundle @@ -1,8 +1,8 @@ FROM golang:1.19-buster AS builder MAINTAINER Hector Sanjuan -# This dockerfile builds cluster and runs it along with go-ipfs. -# It re-uses the latest go-ipfs:release container. +# This dockerfile builds cluster and runs it along with kubo. +# It re-uses the latest kubo:release container. # This builder just builds the cluster binaries ENV GOPATH /go @@ -19,11 +19,11 @@ RUN git config --global --add safe.directory /go/src/github.com/ipfs-cluster/ipf RUN make install #------------------------------------------------------ -FROM ipfs/go-ipfs:release +FROM ipfs/kubo:release MAINTAINER Hector Sanjuan # This is the container which just puts the previously -# built binaries on the go-ipfs-container. +# built binaries on the kubo-container. ENV GOPATH /go ENV SRC_PATH /go/src/github.com/ipfs-cluster/ipfs-cluster diff --git a/Dockerfile-test b/Dockerfile-test index 00983337..38fde10a 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -21,11 +21,11 @@ RUN git config --global --add safe.directory /go/src/github.com/ipfs-cluster/ipf RUN make install #------------------------------------------------------ -FROM ipfs/go-ipfs:master +FROM ipfs/kubo:master-latest MAINTAINER Hector Sanjuan # This is the container which just puts the previously -# built binaries on the go-ipfs-container. +# built binaries on the kubo-container. ENV GOPATH /go ENV SRC_PATH /go/src/github.com/ipfs-cluster/ipfs-cluster diff --git a/README.md b/README.md index 202c6d6e..94d94929 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ There are 3 different applications: -* A cluster peer application: `ipfs-cluster-service`, to be run along with `go-ipfs` as a sidecar. +* A cluster peer application: `ipfs-cluster-service`, to be run along with `kubo` (`go-ipfs`) as a sidecar. * A client CLI application: `ipfs-cluster-ctl`, which allows easily interacting with the peer's HTTP API. * An additional "follower" peer application: `ipfs-cluster-follow`, focused on simplifying the process of configuring and running follower peers. diff --git a/docker-compose.yml b/docker-compose.yml index ad25ec93..cd3a457c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.4' # This is an example docker-compose file to quickly test an IPFS Cluster # with multiple peers on a contained environment. -# It runs 3 cluster peers (cluster0, cluster1...) attached to go-ipfs daemons +# It runs 3 cluster peers (cluster0, cluster1...) attached to kubo daemons # (ipfs0, ipfs1...) using the CRDT consensus component. Cluster peers # autodiscover themselves using mDNS on the docker internal network. # @@ -34,7 +34,7 @@ services: ipfs0: container_name: ipfs0 - image: ipfs/go-ipfs:latest + image: ipfs/kubo:release # ports: # - "4001:4001" # ipfs swarm - expose if needed/wanted # - "5001:5001" # ipfs api - expose if needed/wanted @@ -72,7 +72,7 @@ services: # See Cluster PEER 0 for comments (all removed here and below) ipfs1: container_name: ipfs1 - image: ipfs/go-ipfs:latest + image: ipfs/kubo:release volumes: - ./compose/ipfs1:/data/ipfs @@ -97,7 +97,7 @@ services: # See Cluster PEER 0 for comments (all removed here and below) ipfs2: container_name: ipfs2 - image: ipfs/go-ipfs:latest + image: ipfs/kubo:release volumes: - ./compose/ipfs2:/data/ipfs diff --git a/sharness/lib/test-lib.sh b/sharness/lib/test-lib.sh index 40618342..ec34d547 100755 --- a/sharness/lib/test-lib.sh +++ b/sharness/lib/test-lib.sh @@ -33,9 +33,9 @@ test_ipfs_init() { if docker ps --format '{{.Names}}' | egrep -q '^ipfs$'; then echo "ipfs container already running" else - docker run --name ipfs -d -p 127.0.0.1:5001:5001 ipfs/go-ipfs > /dev/null 2>&1 + docker run --name ipfs -d -p 127.0.0.1:5001:5001 ipfs/kubo > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo "IPFS init FAIL: Error running go-ipfs in docker." + echo "IPFS init FAIL: Error running kubo in docker." exit 1 fi while ! curl -s "localhost:5001/api/v0/version" > /dev/null; do