From 2d9096440dd477c3ad30ef10d3e395062cdb349d Mon Sep 17 00:00:00 2001
From: Eran Davidovich <edavidovich@jumptrading.com>
Date: Wed, 22 Dec 2021 00:05:44 +0200
Subject: [PATCH] fixes to docker-image.yml GH action

---
 .github/workflows/docker-image.yml | 4 ++--
 Dockerfile                         | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 274673fe..fa88fe57 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -28,7 +28,7 @@ jobs:
         with:
           platforms: linux/amd64
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/pyth2wormhole:${{ github.sha }}
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/pyth2wormhole:p2w-attest${{ github.sha::7 }}
           target: p2w-attest
           cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/pyth2wormhole:p2w-attest
           cache-to: type=inline
@@ -39,7 +39,7 @@ jobs:
         with:
           platforms: linux/amd64
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/pyth2wormhole:${{ github.sha }}
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/pyth2wormhole:p2w-relay${{ github.sha::7 }}
           target: p2w-relay
           cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/pyth2wormhole:p2w-relay
           cache-to: type=inline
diff --git a/Dockerfile b/Dockerfile
index 4fc743c0..3269b75e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,6 @@ RUN ./build.sh
 # Cache a build of TypeScript gRPC bindings
 FROM node:16-alpine@sha256:004dbac84fed48e20f9888a23e32fa7cf83c2995e174a78d41d9a9dd1e051a20 AS base-node
 ARG WH_ROOT=/usr/src/wormhole
-ENV WH_ROOT=$WH_ROOT
 # Copy go build artifacts
 COPY --from=base-go $WH_ROOT/tools $WH_ROOT/tools
 COPY buf.* $WH_ROOT/
@@ -37,7 +36,6 @@ ARG WH_BRIDGE="11111111111111111111111111111116"
 ARG WH_ROOT=/usr/src/wormhole
 ENV EMITTER_ADDRESS=$WH_EMITTER
 ENV BRIDGE_ADDRESS=$WH_BRIDGE
-ENV WH_ROOT=$WH_ROOT
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
   apt-get install -y \