Skip to content

Commit

Permalink
Server: fixed dockerfile to exclude erc3kjs package.json (#206)
Browse files Browse the repository at this point in the history
  • Loading branch information
promaty authored Nov 6, 2020
1 parent 9fdcffe commit 2f4178e
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/scripts/docker-build.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/scripts/docker-release.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/sh
set -e # exit on error
SOURCE="$1"
TARGET="$2"
docker pull $SOURCE
Expand Down
1 change: 1 addition & 0 deletions .github/scripts/kubectl-config.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/sh
set -e # exit on error
KUBE_CA="$1"
KUBE_SERVER="$2"
KUBE_TOKEN="$3"
Expand Down
1 change: 1 addition & 0 deletions .github/scripts/kubectl-set-image.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/sh
set -e # exit on error
DEPLOYMENT="$1"
IMAGE="$2"
# replace deployment image
Expand Down
1 change: 1 addition & 0 deletions .github/scripts/kubectl-wait-ready.sh
Original file line number Diff line number Diff line change
@@ -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})
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2f4178e

Please sign in to comment.