From 7ec8455a76dad67f9e3ade9dac58fe93330c3993 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Wed, 28 Sep 2022 11:37:57 -0600 Subject: [PATCH 1/3] Update to latest node container image --- container-build/cerc-laconic-client/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container-build/cerc-laconic-client/Dockerfile b/container-build/cerc-laconic-client/Dockerfile index b83d034f..8fa3be9d 100644 --- a/container-build/cerc-laconic-client/Dockerfile +++ b/container-build/cerc-laconic-client/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.13.1-alpine3.14 +FROM node:16.17.1-alpine3.16 ARG NPM_AUTH_TOKEN WORKDIR /app From 7a32c701521e1237ae987d3f15a702cb40a531b7 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Wed, 28 Sep 2022 20:32:58 -0600 Subject: [PATCH 2/3] Fixes for laconic-sdk --- container-build/cerc-laconic-client/Dockerfile | 2 +- container-build/cerc-laconic-client/build.sh | 3 ++- repository-list.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/container-build/cerc-laconic-client/Dockerfile b/container-build/cerc-laconic-client/Dockerfile index 8fa3be9d..08b86fd5 100644 --- a/container-build/cerc-laconic-client/Dockerfile +++ b/container-build/cerc-laconic-client/Dockerfile @@ -7,4 +7,4 @@ COPY . . RUN echo //npm.pkg.github.com/:_authToken=$NPM_AUTH_TOKEN > ~/.npmrc -RUN apk --update --no-cache add git && yarn +RUN apk --update --no-cache add git && yarn && yarn build diff --git a/container-build/cerc-laconic-client/build.sh b/container-build/cerc-laconic-client/build.sh index d525dd1a..97c646fc 100755 --- a/container-build/cerc-laconic-client/build.sh +++ b/container-build/cerc-laconic-client/build.sh @@ -4,4 +4,5 @@ # See: https://stackoverflow.com/a/246128/1701505 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -docker build -t cerc/laconic-client:local -f ${SCRIPT_DIR}/Dockerfile --build-arg NPM_AUTH_TOKEN=$(NPM_AUTH_TOKEN) ${CERC_REPO_BASE_DIR}/laconic-client +# TODO: change the repo name to laconic-client, if it becomes re-named (laconic-client currently is just the TS protocol client library, not the CLI tool) +docker build -t cerc/laconic-client:local -f ${SCRIPT_DIR}/Dockerfile --build-arg NPM_AUTH_TOKEN=$(NPM_AUTH_TOKEN) ${CERC_REPO_BASE_DIR}/laconic-sdk diff --git a/repository-list.txt b/repository-list.txt index 50fb5e77..42fcc347 100644 --- a/repository-list.txt +++ b/repository-list.txt @@ -7,4 +7,4 @@ vulcanize/ipld-eth-db-validator vulcanize/ipld-eth-beacon-indexer vulcanize/ipld-eth-beacon-db cerc-io/laconicd -cerc-io/laconic-client +cerc-io/laconic-sdk From 0c41f1bed3fe81ad84da1eaf92d3bafb23b9650d Mon Sep 17 00:00:00 2001 From: David Boreham Date: Wed, 28 Sep 2022 21:00:57 -0600 Subject: [PATCH 3/3] Fix entrypoint --- container-build/cerc-laconic-client/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/container-build/cerc-laconic-client/Dockerfile b/container-build/cerc-laconic-client/Dockerfile index 08b86fd5..dab45c26 100644 --- a/container-build/cerc-laconic-client/Dockerfile +++ b/container-build/cerc-laconic-client/Dockerfile @@ -1,3 +1,4 @@ +# TODO: move this into the cerc-io/laconic-sdk (aka client) repo FROM node:16.17.1-alpine3.16 ARG NPM_AUTH_TOKEN @@ -8,3 +9,5 @@ COPY . . RUN echo //npm.pkg.github.com/:_authToken=$NPM_AUTH_TOKEN > ~/.npmrc RUN apk --update --no-cache add git && yarn && yarn build + +ENTRYPOINT ["/app/bin/laconic"]