Skip to content

Commit 5d4fce7

Browse files
authored
Merge pull request #1446 from justinsb/tiltfile_update
chore: update tiltfile for immutable images
2 parents 84b8fb7 + 12f5d4d commit 5d4fce7

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

Tiltfile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,18 +98,23 @@ def validate_auth():
9898

9999
tilt_helper_dockerfile_header = """
100100
# Tilt image
101-
FROM golang:1.18 as tilt-helper
101+
FROM golang:1.23.6 as tilt-helper
102+
# Install delve. Note this should be kept in step with the Go release minor version.
103+
RUN go install github.com/go-delve/delve/cmd/dlv@v1.23
102104
# Support live reloading with Tilt
103-
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \
104-
wget --output-document /start.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/start.sh && \
105-
chmod +x /start.sh && chmod +x /restart.sh
105+
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/restart.sh && \
106+
wget --output-document /start.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/start.sh && \
107+
chmod +x /start.sh && chmod +x /restart.sh && chmod +x /go/bin/dlv && \
108+
touch /process.txt && chmod 0777 /process.txt `# pre-create PID file to allow even non-root users to run the image`
106109
"""
107110

108111
tilt_dockerfile_header = """
109-
FROM gcr.io/distroless/base:debug as tilt
112+
FROM golang:1.23.6 as tilt
110113
WORKDIR /
114+
COPY --from=tilt-helper /process.txt .
111115
COPY --from=tilt-helper /start.sh .
112116
COPY --from=tilt-helper /restart.sh .
117+
COPY --from=tilt-helper /go/bin/dlv .
113118
COPY manager .
114119
"""
115120

0 commit comments

Comments
 (0)