Skip to content

Commit d8e6f7e

Browse files
committed
fix(docker): propagate git-revision correctly
1 parent 75dd0c3 commit d8e6f7e

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

packages/cosmic-swingset/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ COPY lib/*.go lib/
1010
COPY lib/daemon/ lib/daemon/
1111
COPY lib/helper/ lib/helper/
1212
RUN make compile-go install
13+
COPY lib/git-revision.txt lib/

packages/deployment/Dockerfile.sdk

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ FROM node:stretch AS install
33

44
WORKDIR /usr/src/agoric-sdk
55
COPY . .
6-
COPY --from=agoric/cosmic-swingset-go:latest /usr/src/app/lib/ packages/cosmic-swingset/lib/
7-
COPY --from=agoric/cosmic-swingset-go:latest /go/bin/ag-cosmos-helper /usr/local/bin/
6+
COPY --from=agoric/cosmic-swingset:latest /usr/src/app/lib/ packages/cosmic-swingset/lib/
7+
COPY --from=agoric/cosmic-swingset:latest /go/bin/ag-cosmos-helper /usr/local/bin/
88
RUN ln -s agoric-sdk/packages/cosmic-swingset ../app
99
RUN echo 'all:' > packages/cosmic-swingset/Makefile
1010

packages/deployment/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ docker-build-base:
1717
hash=`git rev-parse --short HEAD`; \
1818
dirty=`git diff --quiet || echo -dirty`; \
1919
echo "$$hash$$dirty" > $(SS)lib/git-revision.txt
20-
docker build -t $(REPOSITORY)-go:latest $(SS)
20+
docker build -t $(REPOSITORY):latest $(SS)
2121

2222
docker-build-pserver:
2323
docker build -t $(REPOSITORY)-pserver:latest $(SS)provisioning-server

0 commit comments

Comments
 (0)