From 090a8e0c7454d512fcb489171112055990aa3bf0 Mon Sep 17 00:00:00 2001
From: Evan Gray <battledingo@gmail.com>
Date: Wed, 26 Oct 2022 19:24:46 +0000
Subject: [PATCH] relayer: fix ci

---
 Tiltfile                       | 3 +--
 devnet/spy-listener.yaml       | 2 +-
 devnet/spy-relayer.yaml        | 2 +-
 devnet/spy-wallet-monitor.yaml | 2 +-
 relayer/spy_relayer/Dockerfile | 7 +++++--
 scripts/check-docker-pin.sh    | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Tiltfile b/Tiltfile
index 77f874d24..fb00270e5 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -439,8 +439,7 @@ if spy_relayer:
 
     docker_build(
         ref = "spy-relay-image",
-        context = ".",
-        only = ["./relayer/spy_relayer"],
+        context = "relayer/spy_relayer",
         dockerfile = "relayer/spy_relayer/Dockerfile",
         live_update = []
     )
diff --git a/devnet/spy-listener.yaml b/devnet/spy-listener.yaml
index adbc0106d..73ccfe2fc 100644
--- a/devnet/spy-listener.yaml
+++ b/devnet/spy-listener.yaml
@@ -41,7 +41,7 @@ spec:
             - npm
             - run
             - --prefix
-            - /app/relayer/spy_relayer/
+            - /app
             - tilt_listener
           tty: true
           readinessProbe:
diff --git a/devnet/spy-relayer.yaml b/devnet/spy-relayer.yaml
index 99021dbd3..9dd21a400 100644
--- a/devnet/spy-relayer.yaml
+++ b/devnet/spy-relayer.yaml
@@ -41,7 +41,7 @@ spec:
             - npm
             - run
             - --prefix
-            - /app/relayer/spy_relayer/
+            - /app
             - tilt_relayer
           ports:
             - containerPort: 8083
diff --git a/devnet/spy-wallet-monitor.yaml b/devnet/spy-wallet-monitor.yaml
index ccdcad07e..43dc8f4b7 100644
--- a/devnet/spy-wallet-monitor.yaml
+++ b/devnet/spy-wallet-monitor.yaml
@@ -41,7 +41,7 @@ spec:
             - npm
             - run
             - --prefix
-            - /app/relayer/spy_relayer/
+            - /app
             - tilt_wallet_monitor
           ports:
             - containerPort: 8084
diff --git a/relayer/spy_relayer/Dockerfile b/relayer/spy_relayer/Dockerfile
index 45b2a5567..8731b8e2a 100644
--- a/relayer/spy_relayer/Dockerfile
+++ b/relayer/spy_relayer/Dockerfile
@@ -14,7 +14,7 @@ COPY package-lock.json package-lock.json
 COPY tsconfig.json tsconfig.json
 COPY jestconfig.json jestconfig.json
 
-FROM base as builder
+FROM base AS builder
 
 RUN --mount=type=cache,target=/root/.npm \
     npm ci
@@ -22,12 +22,15 @@ RUN --mount=type=cache,target=/root/.npm \
 COPY src src
 RUN npm run build && npm prune --production
 
-FROM base as application
+FROM base AS application
 
 LABEL org.opencontainers.image.source="https://github.com/wormhole-foundation/wormhole/tree/dev.v2/relayer/spy_relayer#readme"
 
 COPY --from=builder /app/node_modules node_modules
 COPY --from=builder /app/lib lib
+COPY .env.tilt.listener /app/
+COPY .env.tilt.relayer /app/
+COPY .env.tilt.wallet-monitor /app/
 
 CMD [ "node", "lib/main.js" ]
 
diff --git a/scripts/check-docker-pin.sh b/scripts/check-docker-pin.sh
index 77cd378c5..e908e5a1e 100755
--- a/scripts/check-docker-pin.sh
+++ b/scripts/check-docker-pin.sh
@@ -11,7 +11,7 @@
 #   - We ignore scratch because it's literally the docker base image
 #   - We ignore solana AS (builder|ci_tests) because it's a relative reference to another FROM call
 #
-git ls-files | grep "Dockerfile*" | xargs grep -s "FROM" | egrep -v 'sha256|scratch|solana|aptos AS (builder|ci_tests|tests)'
+git ls-files | grep "Dockerfile*" | xargs grep -s "FROM" | egrep -v 'sha256|scratch|solana|aptos|base AS (application|base|builder|ci_tests|tests)'
 if [ $? -eq 0 ]; then
    echo "[!] Unpinned docker files" >&2
    exit 1