add docker image push ci

fiamma-chain · Jul 8, 2024 · ae2118d · ae2118d
1 parent 20e3b85
commit ae2118d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 27 deletions.
diff --git a/.github/workflows/publish-docker-image.yml b/.github/workflows/publish-docker-image.yml
@@ -26,6 +26,5 @@ jobs:
     - name: Build and Push Docker Image
       uses: docker/build-push-action@v2
       with:
-        file: ./contrib/images/fiammad/Dockerfile
         push: true
         tags: fiammachain/fiammad:${{ github.ref == 'refs/tags/*' && github.ref || github.sha }}
diff --git a/contrib/images/fiammad/Dockerfile → Dockerfile b/contrib/images/fiammad/Dockerfile → Dockerfile
@@ -4,10 +4,7 @@ FROM golang:1.22 AS build-env
 
 # TARGETPLATFORM should be one of linux/amd64 or linux/arm64.
 ARG TARGETPLATFORM="linux/amd64"
-# Version to build. Default is empty
-ARG VERSION
 
-ARG LEDGER_ENABLED="false"
 # Cosmos build options
 ARG COSMOS_BUILD_OPTIONS=""
 
@@ -44,8 +41,6 @@ FROM debian:bookworm-slim AS run
 
 RUN apt-get update && apt-get install -y bash curl jq wget pkg-config openssl libssl-dev
 
-# Label should match your github repo
-LABEL org.opencontainers.image.source="https://github.com/fiamma-chain/fiammad:${VERSION}"
 
 # Install libraries
 # Cosmwasm - Download correct libwasmvm version

diff --git a/Makefile b/Makefile
@@ -219,6 +219,13 @@ test:
 ###############################################################################
 
 build-docker:
-	$(MAKE) -C contrib/images fiammad
+	docker build \
+	-t fiammachain/fiammad \
+	--build-arg GIT_VERSION=$(VERSION) \
+	--build-arg GIT_COMMIT=$(COMMIT) \
+	-f Dockerfile .
 
-.PHONY: build-docker
+docker-rmi: 
+	docker rmi fiammachain/fiammad 2>/dev/null; true
+
+.PHONY: build-docker docker-rmi
diff --git a/contrib/images/Makefile b/contrib/images/Makefile
diff --git a/scripts/docker/node.docker-compose.yml b/scripts/docker/node.docker-compose.yml
@@ -5,7 +5,7 @@ services:
     image: fiammachain/fiammad
     build:
       context: ../../
-      dockerfile: ../../contrib/images/fiammad/Dockerfile
+      dockerfile: ../../Dockerfile
     volumes:
       - ../testnet-nodes/${NODE_NAME}:/root/.fiamma
       - ../setup_node.sh:/entrypoint.sh
@@ -14,7 +14,7 @@ services:
   node-runner:
     image: fiammachain/fiammad
     build:
-      dockerfile: ../../contrib/images/fiammad/Dockerfile
+      dockerfile: ../../Dockerfile
     volumes:
       - ../testnet-nodes/${NODE_NAME}:/root/.fiamma
     command: start

diff --git a/scripts/docker/validator.docker-compose.yml b/scripts/docker/validator.docker-compose.yml
@@ -5,7 +5,7 @@ services:
     image: fiammachain/fiammad
     build:
       context: ../../
-      dockerfile: ./contrib/images/fiammad/Dockerfile
+      dockerfile: ../../Dockerfile
     volumes:
       - ../testnet-nodes/${NODE_NAME}:/root/.fiamma
       - ../setup_node.sh:/entrypoint.sh
@@ -14,8 +14,8 @@ services:
   validator-setup:
     image: fiammachain/fiammad
     build:
-      context: ../
-      dockerfile: ./contrib/images/fiammad/Dockerfile
+      context: ../../
+      dockerfile: ../../Dockerfile
     volumes:
       - ../testnet-nodes/${NODE_NAME}:/root/.fiamma
       - ../setup_validator.sh:/entrypoint.sh
@@ -25,7 +25,7 @@ services:
     image: fiammachain/fiammad
     build:
       context: ../../
-      dockerfile: ./contrib/images/fiammad/Dockerfile
+      dockerfile: ../../Dockerfile
     ports:
       - 26656:26656
       - 26657:26657