File tree Expand file tree Collapse file tree 2 files changed +6
-17
lines changed
Expand file tree Collapse file tree 2 files changed +6
-17
lines changed Original file line number Diff line number Diff line change @@ -205,10 +205,6 @@ commands:
205205 type : string
206206 description : " Path to persist Docker archive"
207207 default : " ~/docker"
208- build-arg :
209- type : string
210- description : " Args to pass into docker file"
211- default : " "
212208 steps :
213209 - when :
214210 condition : <<parameters.import>>
@@ -226,11 +222,7 @@ commands:
226222 DIRNAME="$(dirname "$DOCKERFILE")"
227223
228224 cd "$DIRNAME" || exit 1
229- if [ -z "<<parameters.build-arg>>" ]; then
230- docker build . --cache-from "<<parameters.image>>" -t "<<parameters.image>>" -f "$BASENAME"
231- else
232- docker build . --cache-from "<<parameters.image>>" -t "<<parameters.image>>" -f "$BASENAME" --build-arg <<parameters.build-arg>>
233- fi
225+ docker build . --cache-from "<<parameters.image>>" -t "<<parameters.image>>" -f "$BASENAME"
234226 - when :
235227 condition : <<parameters.export>>
236228 steps :
@@ -386,11 +378,13 @@ jobs:
386378 steps :
387379 - setup_remote_docker
388380 - attach_workspace : *attach_workspace
381+ - run : |
382+ echo ${GITHUB_TOKEN} | git clone https://omisego-bot@github.com/omgnetwork/$(cat tester/CONTRACT_REPO_NAME).git tester/plasma-contracts
389383 - docker_build :
390384 image : " omisegoimages/elixir-omg-tester-plasma-deployer"
391385 dockerfile : " tester/Dockerfile.plasma_deployer"
392386 export : " ~/docker/omisegoimages_elixir-omg_tester_plasma_deployer.tar"
393- build-arg : " GITHUB_TOKEN=${GITHUB_TOKEN} "
387+
394388 - persist_to_workspace :
395389 << : *persist_workspace
396390 paths :
Original file line number Diff line number Diff line change 11FROM node:10.22-alpine
22
3- MAINTAINER OmiseGO Engineering <info@omisego.co>
4-
5- ARG GITHUB_TOKEN
3+ MAINTAINER OMG Network Engineering <engineering@omg.network>
64
75WORKDIR /home/node
86
@@ -15,10 +13,7 @@ RUN apk add --update \
1513
1614COPY CONTRACT_SHA /tmp/CONTRACT_SHA
1715COPY CONTRACT_REPO_NAME /tmp/CONTRACT_REPO_NAME
18-
19- # pass in token for prompt instead of git clone https://${GITHUB_TOKEN}@github.com... to avoid
20- # leaving the token data in .git/config
21- RUN echo ${GITHUB_TOKEN} | git clone https://omisego-bot@github.com/omgnetwork/$(cat /tmp/CONTRACT_REPO_NAME).git plasma-contracts
16+ COPY plasma-contracts /home/node/plasma-contracts
2217RUN cd /home/node/plasma-contracts && git reset --hard $(cat /tmp/CONTRACT_SHA)
2318RUN cd /home/node/plasma-contracts && npm install
2419RUN cd /home/node/plasma-contracts/plasma_framework && rm -Rf ./build
You can’t perform that action at this time.
0 commit comments