update Dockerfile and Makefile

migalabs · Mar 21, 2024 · 08d9ea8 · 08d9ea8
1 parent 349c90c
commit 08d9ea8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,11 @@
 # syntax=docker/dockerfile:1
 
 # chosen buster image for
-FROM golang:1.17.13-buster AS builder
+FROM golang:1.21-alpine AS builder
 
 WORKDIR /
-RUN apt-get install git
+RUN apk add --no-cache git
+RUN apk add --no-cache make
 COPY ./ /armiarma
 
 #RUN make dependencies

diff --git a/Makefile b/Makefile
@@ -14,9 +14,9 @@ build:
 	$(GOCC) build -o $(BIN)
 
 dependencies:
-	$(GIT_SUBM) update --init
-	cd go-libp2p-pubsub && git checkout origin/armiarma-v2 && git pull origin armiarma-v2
-	cd ../
+	$(GIT_SUBM) update --init 
+	cd go-libp2p-pubsub && git checkout "origin/armiarma-v2" && git pull origin armiarma-v2
+	cd ..
 
 install:
 	$(GOCC) install

diff --git a/go.mod b/go.mod
@@ -13,7 +13,6 @@ require (
 	github.com/libp2p/go-libp2p-kbucket v0.4.7
 	github.com/libp2p/go-libp2p-mplex v0.9.0
 	github.com/libp2p/go-libp2p-pubsub v0.10.0
-	github.com/libp2p/go-libp2p-swarm v0.11.0
 	github.com/libp2p/go-msgio v0.3.0
 	github.com/minio/sha256-simd v1.0.1
 	github.com/multiformats/go-multiaddr v0.12.2
@@ -91,6 +90,7 @@ require (
 	github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
 	github.com/libp2p/go-libp2p-peerstore v0.8.0 // indirect
 	github.com/libp2p/go-libp2p-record v0.1.3 // indirect
+	github.com/libp2p/go-libp2p-swarm v0.11.0 // indirect
 	github.com/libp2p/go-mplex v0.7.0 // indirect
 	github.com/libp2p/go-nat v0.2.0 // indirect
 	github.com/libp2p/go-netroute v0.2.1 // indirect