Fix ipfs credential assign (#231)

* Fix ipfs credential assign

* Update submodule

Makefile

@@ -151,11 +151,15 @@ profile: ## Test and profile
 
 docker-image: ## Build Docker image
 	@echo "-> Building docker image..."
-	@$(DOCKER) build -t $(DOCKER_IMAGE):$(VERSION) -f ./build/docker/Dockerfile.dev .
+	@$(DOCKER) build \
+		--build-arg WAYBACK_IPFS_APIKEY=$(shell echo ${WAYBACK_IPFS_APIKEY}) \
+		-t $(DOCKER_IMAGE):$(VERSION) \
+		-f ./build/docker/Dockerfile.dev .
 
 rpm: ## Build RPM package
 	@echo "-> Building rpm package..."
 	@$(DOCKER) build \
+		--build-arg WAYBACK_IPFS_APIKEY=$(shell echo ${WAYBACK_IPFS_APIKEY}) \
 		-t wayback-rpm-builder \
 		-f build/redhat/Dockerfile .
 	@$(DOCKER) run --rm \
@@ -168,6 +172,7 @@ debian: ## Build Debian packages
 		--build-arg IMAGE_ARCH=$(DEB_IMG_ARCH) \
 		--build-arg PKG_VERSION=$(VERSION) \
 		--build-arg PKG_ARCH=$(PKG_ARCH) \
+		--build-arg WAYBACK_IPFS_APIKEY=$(shell echo ${WAYBACK_IPFS_APIKEY}) \
 		-t $(DEB_IMG_ARCH)/wayback-deb-builder \
 		-f build/debian/Dockerfile .
 	@$(DOCKER) run --rm \

build/debian/Dockerfile

@@ -6,6 +6,7 @@ FROM ${IMAGE_ARCH}/golang:buster AS build
 
 ARG PKG_ARCH
 ARG PKG_VERSION
+ARG WAYBACK_IPFS_APIKEY
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update -q && \
@@ -15,6 +16,8 @@ RUN apt-get update -q && \
 RUN mkdir -p /build/debian /pkg
 COPY . /src
 WORKDIR /src/build/debian
+
+ENV WAYBACK_IPFS_APIKEY ${WAYBACK_IPFS_APIKEY}
 ENV PKG_VERSION ${PKG_VERSION}
 ENV PKG_ARCH ${PKG_ARCH}
 

build/docker/Dockerfile.all

@@ -7,8 +7,12 @@ COPY --from=tonistiigi/xx:golang / /
 RUN apk add --no-cache -U build-base ca-certificates linux-headers musl-dev git tar
 
 ARG TARGETPLATFORM
+ARG WAYBACK_IPFS_APIKEY
+
 WORKDIR /src
 
+ENV WAYBACK_IPFS_APIKEY $WAYBACK_IPFS_APIKEY
+
 COPY . .
 RUN --mount=type=bind,target=/src,rw \
     --mount=type=cache,target=/root/.cache/go-build \

build/docker/Dockerfile.dev

@@ -6,8 +6,12 @@ FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS builder
 RUN apk add --no-cache -U build-base ca-certificates linux-headers musl-dev git tar
 
 ARG TARGETPLATFORM
+ARG WAYBACK_IPFS_APIKEY
+
 WORKDIR /src
 
+ENV WAYBACK_IPFS_APIKEY $WAYBACK_IPFS_APIKEY
+
 COPY . .
 RUN set -eu && \
     sh ./build/binary.sh $TARGETPLATFORM \

build/redhat/Dockerfile

@@ -4,10 +4,14 @@
 #
 FROM golang:1.19-alpine AS builder
 
+ARG WAYBACK_IPFS_APIKEY
+
 RUN apk update && apk add --no-cache build-base ca-certificates git
 # Required by statically linked binary with OpenSSL
 # RUN apk add linux-headers
 
+ENV WAYBACK_IPFS_APIKEY ${WAYBACK_IPFS_APIKEY}
+
 WORKDIR /go/src/app
 COPY . .
 RUN make linux-amd64