From 5e8bcf40750cfda5b202ec648c1dbb393a7c65a7 Mon Sep 17 00:00:00 2001 From: Antonio Antonino Date: Tue, 12 Dec 2023 16:07:25 +0100 Subject: [PATCH 1/3] Add Docker image push for DIP provider and consumer templates --- .gitlab-ci.yml | 2 ++ .maintain/build-image.sh | 16 ++++++++++++++++ .maintain/push-image.sh | 8 ++++++++ 3 files changed, 26 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b474a0a3d5..e491cf2026 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,6 +42,8 @@ build: variables: DOCKER_HUB_PARACHAIN: "kiltprotocol/kilt-node" DOCKER_HUB_STANDALONE: "kiltprotocol/standalone-node" + DOCKER_HUB_DIP_PROVIDER_TEMPLATE: "kiltprotocol/dip-provider-node-template" + DOCKER_HUB_DIP_CONSUMER_TEMPLATE: "kiltprotocol/dip-consumer-node-template" before_script: - aws --version - docker --version diff --git a/.maintain/build-image.sh b/.maintain/build-image.sh index 2222482734..a496f22c82 100755 --- a/.maintain/build-image.sh +++ b/.maintain/build-image.sh @@ -22,3 +22,19 @@ docker build \ --build-arg NODE_TYPE=standalone-node \ -t local/standalone-node:$target_tag \ . + +# build DIP provider and consumer templates +PROVIDER_BIN_NAME="dip-provider-node-template" +docker build \ + --cache-from $AWS_REGISTRY/kilt-parachain/collator:builder \ + --cache-from $AWS_REGISTRY/kilt-parachain/collator:$target_tag \ + --build-arg NODE_TYPE=$PROVIDER_BIN_NAME \ + -t local/$PROVIDER_BIN_NAME:$target_tag \ + . +CONSUMER_BIN_NAME="dip-consumer-node-template" +docker build \ + --cache-from $AWS_REGISTRY/kilt-parachain/collator:builder \ + --cache-from $AWS_REGISTRY/kilt-parachain/collator:$target_tag \ + --build-arg NODE_TYPE=$CONSUMER_BIN_NAME \ + -t local/$CONSUMER_BIN_NAME:$target_tag \ + . diff --git a/.maintain/push-image.sh b/.maintain/push-image.sh index 4bb38e5e89..e434ff875a 100755 --- a/.maintain/push-image.sh +++ b/.maintain/push-image.sh @@ -6,13 +6,21 @@ target_tag=$2 # publish to docker hub docker tag local/standalone-node:$source_tag ${DOCKER_HUB_STANDALONE}:$target_tag docker tag local/kilt-node:$source_tag ${DOCKER_HUB_PARACHAIN}:$target_tag +docker tag local/dip-provider-node-template:$source_tag ${DOCKER_HUB_DIP_PROVIDER_TEMPLATE}:$target_tag +docker tag local/dip-consumer-node-template:$source_tag ${DOCKER_HUB_DIP_CONSUMER_TEMPLATE}:$target_tag docker push ${DOCKER_HUB_STANDALONE}:$target_tag docker push ${DOCKER_HUB_PARACHAIN}:$target_tag +docker push ${DOCKER_HUB_DIP_PROVIDER_TEMPLATE}:$target_tag +docker push ${DOCKER_HUB_DIP_CONSUMER_TEMPLATE}:$target_tag # publish to AWS docker tag local/standalone-node:$source_tag $AWS_REGISTRY/kilt/prototype-chain:$target_tag docker tag local/kilt-node:$source_tag $AWS_REGISTRY/kilt-parachain/collator:$target_tag +docker tag local/dip-provider-node-template:$source_tag $AWS_REGISTRY/dip-provider-node-template:$target_tag +docker tag local/dip-consumer-node-template:$source_tag $AWS_REGISTRY/dip-consumer-node-template:$target_tag docker push $AWS_REGISTRY/kilt/prototype-chain:$target_tag docker push $AWS_REGISTRY/kilt-parachain/collator:$target_tag +docker push $AWS_REGISTRY/dip-provider-node-template:$target_tag +docker push $AWS_REGISTRY/dip-consumer-node-template:$target_tag From 1a9ccb12ccb25d03c9858d13c7e5b17ac10e7dde Mon Sep 17 00:00:00 2001 From: Antonio Antonino Date: Tue, 12 Dec 2023 16:19:55 +0100 Subject: [PATCH 2/3] Fix cache-from --- .maintain/build-image.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.maintain/build-image.sh b/.maintain/build-image.sh index a496f22c82..ca46e6fdfe 100755 --- a/.maintain/build-image.sh +++ b/.maintain/build-image.sh @@ -27,14 +27,14 @@ docker build \ PROVIDER_BIN_NAME="dip-provider-node-template" docker build \ --cache-from $AWS_REGISTRY/kilt-parachain/collator:builder \ - --cache-from $AWS_REGISTRY/kilt-parachain/collator:$target_tag \ + --cache-from $AWS_REGISTRY/dip-provider-node-template:$target_tag \ --build-arg NODE_TYPE=$PROVIDER_BIN_NAME \ -t local/$PROVIDER_BIN_NAME:$target_tag \ . CONSUMER_BIN_NAME="dip-consumer-node-template" docker build \ --cache-from $AWS_REGISTRY/kilt-parachain/collator:builder \ - --cache-from $AWS_REGISTRY/kilt-parachain/collator:$target_tag \ + --cache-from $AWS_REGISTRY/dip-consumer-node-template:$target_tag \ --build-arg NODE_TYPE=$CONSUMER_BIN_NAME \ -t local/$CONSUMER_BIN_NAME:$target_tag \ . From 2e1bb5c5b320e08c1dee236a7ae488772a4ad42d Mon Sep 17 00:00:00 2001 From: Antonio Antonino Date: Tue, 12 Dec 2023 16:25:20 +0100 Subject: [PATCH 3/3] Use more variables --- .maintain/build-image.sh | 4 ++-- .maintain/push-image.sh | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.maintain/build-image.sh b/.maintain/build-image.sh index ca46e6fdfe..b179b7928f 100755 --- a/.maintain/build-image.sh +++ b/.maintain/build-image.sh @@ -27,14 +27,14 @@ docker build \ PROVIDER_BIN_NAME="dip-provider-node-template" docker build \ --cache-from $AWS_REGISTRY/kilt-parachain/collator:builder \ - --cache-from $AWS_REGISTRY/dip-provider-node-template:$target_tag \ + --cache-from $AWS_REGISTRY/$PROVIDER_BIN_NAME:$target_tag \ --build-arg NODE_TYPE=$PROVIDER_BIN_NAME \ -t local/$PROVIDER_BIN_NAME:$target_tag \ . CONSUMER_BIN_NAME="dip-consumer-node-template" docker build \ --cache-from $AWS_REGISTRY/kilt-parachain/collator:builder \ - --cache-from $AWS_REGISTRY/dip-consumer-node-template:$target_tag \ + --cache-from $AWS_REGISTRY/$CONSUMER_BIN_NAME:$target_tag \ --build-arg NODE_TYPE=$CONSUMER_BIN_NAME \ -t local/$CONSUMER_BIN_NAME:$target_tag \ . diff --git a/.maintain/push-image.sh b/.maintain/push-image.sh index e434ff875a..ba46da0ea1 100755 --- a/.maintain/push-image.sh +++ b/.maintain/push-image.sh @@ -3,11 +3,14 @@ source_tag=$1 target_tag=$2 +PROVIDER_BIN_NAME="dip-provider-node-template" +CONSUMER_BIN_NAME="dip-consumer-node-template" + # publish to docker hub docker tag local/standalone-node:$source_tag ${DOCKER_HUB_STANDALONE}:$target_tag docker tag local/kilt-node:$source_tag ${DOCKER_HUB_PARACHAIN}:$target_tag -docker tag local/dip-provider-node-template:$source_tag ${DOCKER_HUB_DIP_PROVIDER_TEMPLATE}:$target_tag -docker tag local/dip-consumer-node-template:$source_tag ${DOCKER_HUB_DIP_CONSUMER_TEMPLATE}:$target_tag +docker tag local/$PROVIDER_BIN_NAME:$source_tag ${DOCKER_HUB_DIP_PROVIDER_TEMPLATE}:$target_tag +docker tag local/$CONSUMER_BIN_NAME:$source_tag ${DOCKER_HUB_DIP_CONSUMER_TEMPLATE}:$target_tag docker push ${DOCKER_HUB_STANDALONE}:$target_tag docker push ${DOCKER_HUB_PARACHAIN}:$target_tag @@ -17,10 +20,10 @@ docker push ${DOCKER_HUB_DIP_CONSUMER_TEMPLATE}:$target_tag # publish to AWS docker tag local/standalone-node:$source_tag $AWS_REGISTRY/kilt/prototype-chain:$target_tag docker tag local/kilt-node:$source_tag $AWS_REGISTRY/kilt-parachain/collator:$target_tag -docker tag local/dip-provider-node-template:$source_tag $AWS_REGISTRY/dip-provider-node-template:$target_tag -docker tag local/dip-consumer-node-template:$source_tag $AWS_REGISTRY/dip-consumer-node-template:$target_tag +docker tag local/$PROVIDER_BIN_NAME:$source_tag $AWS_REGISTRY/$PROVIDER_BIN_NAME:$target_tag +docker tag local/$CONSUMER_BIN_NAME:$source_tag $AWS_REGISTRY/$CONSUMER_BIN_NAME:$target_tag docker push $AWS_REGISTRY/kilt/prototype-chain:$target_tag docker push $AWS_REGISTRY/kilt-parachain/collator:$target_tag -docker push $AWS_REGISTRY/dip-provider-node-template:$target_tag -docker push $AWS_REGISTRY/dip-consumer-node-template:$target_tag +docker push $AWS_REGISTRY/$PROVIDER_BIN_NAME:$target_tag +docker push $AWS_REGISTRY/$CONSUMER_BIN_NAME:$target_tag