diff --git a/.github/scripts/docker-build.sh b/.github/scripts/docker-build.sh index 9c0d0ccb5..bee63373c 100755 --- a/.github/scripts/docker-build.sh +++ b/.github/scripts/docker-build.sh @@ -1,8 +1,9 @@ #!/bin/sh -# use previously built image for cache if possible +set -e # exit on error DOCKERFILE_PATH="$1" REPO="$2" GITHUB_SHA="$3" +# use previously built image for cache if possible docker pull $REPO:latest || true docker pull $REPO:rolling || true docker build $DOCKERFILE_PATH -t $REPO:${GITHUB_SHA} -t $REPO:rolling --cache-from $REPO:rolling --cache-from $REPO:latest diff --git a/.github/scripts/docker-release.sh b/.github/scripts/docker-release.sh index 0e39a5c47..5c841aacb 100755 --- a/.github/scripts/docker-release.sh +++ b/.github/scripts/docker-release.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e # exit on error SOURCE="$1" TARGET="$2" docker pull $SOURCE diff --git a/.github/scripts/kubectl-config.sh b/.github/scripts/kubectl-config.sh index ee9c593a4..723bfebd5 100755 --- a/.github/scripts/kubectl-config.sh +++ b/.github/scripts/kubectl-config.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e # exit on error KUBE_CA="$1" KUBE_SERVER="$2" KUBE_TOKEN="$3" diff --git a/.github/scripts/kubectl-set-image.sh b/.github/scripts/kubectl-set-image.sh index 04482f989..57331955e 100755 --- a/.github/scripts/kubectl-set-image.sh +++ b/.github/scripts/kubectl-set-image.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e # exit on error DEPLOYMENT="$1" IMAGE="$2" # replace deployment image diff --git a/.github/scripts/kubectl-wait-ready.sh b/.github/scripts/kubectl-wait-ready.sh index d1d3418ac..4655fff31 100755 --- a/.github/scripts/kubectl-wait-ready.sh +++ b/.github/scripts/kubectl-wait-ready.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e # exit on error APP="$1" # wait 5 min for the new pod to be ready. If the pod is not ready there is a problem with the new container kubectl wait pod --for condition=Ready --timeout=300s $(kubectl get pods -l app=$APP --sort-by {.metadata.creationTimestamp} -o jsonpath={.items[-1].metadata.name}) diff --git a/Dockerfile b/Dockerfile index 53ec61c77..c92853587 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,6 @@ WORKDIR /app # copy all package json files COPY ./package.json /app/package.json COPY ./packages/erc3k/package.json /app/packages/erc3k/package.json -COPY ./packages/erc3kjs/package.json /app/packages/erc3kjs/package.json COPY ./packages/govern/package.json /app/packages/govern/package.json COPY ./packages/govern-console/package.json /app/packages/govern-console/package.json COPY ./packages/govern-contract-utils/package.json /app/packages/govern-contract-utils/package.json