fix(docker): propagate git-revision correctly

Agoric · Dec 12, 2019 · d8e6f7e · d8e6f7e
1 parent 75dd0c3
commit d8e6f7e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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