From d8e6f7eca73a9fe6ba5ce4f9a01d38cd768c89d1 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Thu, 12 Dec 2019 14:50:08 -0600 Subject: [PATCH] fix(docker): propagate git-revision correctly --- packages/cosmic-swingset/Dockerfile | 1 + packages/deployment/Dockerfile.sdk | 4 ++-- packages/deployment/Makefile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/cosmic-swingset/Dockerfile b/packages/cosmic-swingset/Dockerfile index 124123b3ba4..f6f0d80cbf6 100644 --- a/packages/cosmic-swingset/Dockerfile +++ b/packages/cosmic-swingset/Dockerfile @@ -10,3 +10,4 @@ COPY lib/*.go lib/ COPY lib/daemon/ lib/daemon/ COPY lib/helper/ lib/helper/ RUN make compile-go install +COPY lib/git-revision.txt lib/ diff --git a/packages/deployment/Dockerfile.sdk b/packages/deployment/Dockerfile.sdk index 4b9d37c267b..9398261fc0b 100644 --- a/packages/deployment/Dockerfile.sdk +++ b/packages/deployment/Dockerfile.sdk @@ -3,8 +3,8 @@ FROM node:stretch AS install WORKDIR /usr/src/agoric-sdk COPY . . -COPY --from=agoric/cosmic-swingset-go:latest /usr/src/app/lib/ packages/cosmic-swingset/lib/ -COPY --from=agoric/cosmic-swingset-go:latest /go/bin/ag-cosmos-helper /usr/local/bin/ +COPY --from=agoric/cosmic-swingset:latest /usr/src/app/lib/ packages/cosmic-swingset/lib/ +COPY --from=agoric/cosmic-swingset:latest /go/bin/ag-cosmos-helper /usr/local/bin/ RUN ln -s agoric-sdk/packages/cosmic-swingset ../app RUN echo 'all:' > packages/cosmic-swingset/Makefile diff --git a/packages/deployment/Makefile b/packages/deployment/Makefile index 64c99304a76..461bdd4e45b 100644 --- a/packages/deployment/Makefile +++ b/packages/deployment/Makefile @@ -17,7 +17,7 @@ docker-build-base: hash=`git rev-parse --short HEAD`; \ dirty=`git diff --quiet || echo -dirty`; \ echo "$$hash$$dirty" > $(SS)lib/git-revision.txt - docker build -t $(REPOSITORY)-go:latest $(SS) + docker build -t $(REPOSITORY):latest $(SS) docker-build-pserver: docker build -t $(REPOSITORY)-pserver:latest $(SS)provisioning-server