Skip to content

Commit 494b5af

Browse files
kenzoengineerMeredithAnya
authored andcommitted
update sha, fix dockerfile copy
1 parent 081de6a commit 494b5af

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

.github/workflows/validate-sentry-options.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
if: needs.files-changed.outputs.schemas == 'true'
2929
needs: files-changed
3030
name: Validate Schema Evolution
31-
uses: getsentry/sentry-options/.github/workflows/validate-schema.yml@3e1f872ac6fd477bf22e53fd67eb30b761b4169b
31+
uses: getsentry/sentry-options/.github/workflows/validate-schema.yml@fa066c1d3ef0849153092a0272c17fc0bcce14c8
3232
secrets: inherit
3333
with:
3434
schemas-path: sentry-options/schemas

Dockerfile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ ENV LD_PRELOAD=/usr/src/snuba/libjemalloc.so.2 \
134134
PYTHONUNBUFFERED=1 \
135135
PYTHONDONTWRITEBYTECODE=1
136136

137+
# set up sentry options schemas and default path
138+
COPY sentry-options/schemas /etc/sentry-options/schemas
139+
ENV SENTRY_OPTIONS_DIR=/etc/sentry-options
140+
137141
USER snuba
138142
EXPOSE 1218 1219
139143
ENTRYPOINT [ "./docker_entrypoint.sh" ]
@@ -163,6 +167,7 @@ FROM ghcr.io/getsentry/dhi/python:3.13-debian13 AS application-distroless
163167

164168
COPY --from=distroless_prep /.venv /.venv
165169
COPY --from=distroless_prep /usr/src/snuba /usr/src/snuba
170+
COPY --from=distroless_prep /etc/sentry-options /etc/sentry-options
166171
COPY --from=distroless_prep /usr/lib/*/libjemalloc.so.2 /usr/lib/libjemalloc.so.2
167172
COPY --from=distroless_prep /etc/passwd /etc/passwd
168173
COPY --from=distroless_prep /etc/group /etc/group
@@ -174,7 +179,8 @@ ENV PATH="/.venv/bin:/opt/python/bin:$PATH" \
174179
SNUBA_RELEASE=$SOURCE_COMMIT \
175180
FLASK_DEBUG=0 \
176181
PYTHONUNBUFFERED=1 \
177-
PYTHONDONTWRITEBYTECODE=1
182+
PYTHONDONTWRITEBYTECODE=1 \
183+
SENTRY_OPTIONS_DIR=/etc/sentry-options
178184

179185
USER 1000
180186
EXPOSE 1218 1219
@@ -186,6 +192,7 @@ FROM ghcr.io/getsentry/dhi/python:3.13-debian13-dev AS application-distroless-de
186192

187193
COPY --from=distroless_prep /.venv /.venv
188194
COPY --from=distroless_prep /usr/src/snuba /usr/src/snuba
195+
COPY --from=distroless_prep /etc/sentry-options /etc/sentry-options
189196
COPY --from=distroless_prep /usr/lib/*/libjemalloc.so.2 /usr/lib/libjemalloc.so.2
190197
COPY --from=distroless_prep /etc/passwd /etc/passwd
191198
COPY --from=distroless_prep /etc/group /etc/group
@@ -197,7 +204,8 @@ ENV PATH="/.venv/bin:/opt/python/bin:$PATH" \
197204
SNUBA_RELEASE=$SOURCE_COMMIT \
198205
FLASK_DEBUG=0 \
199206
PYTHONUNBUFFERED=1 \
200-
PYTHONDONTWRITEBYTECODE=1
207+
PYTHONDONTWRITEBYTECODE=1 \
208+
SENTRY_OPTIONS_DIR=/etc/sentry-options
201209

202210
USER 1000
203211
EXPOSE 1218 1219
@@ -223,9 +231,5 @@ RUN set -ex; \
223231
rm -rf /tmp/rust_wheels/; \
224232
snuba --help
225233

226-
# set up sentry options schemas and default path
227-
COPY sentry-options/schemas /etc/sentry-options/schemas
228-
ENV SENTRY_OPTIONS_DIR=/etc/sentry-options
229-
230234
ENV PATH="${PATH}:/root/.cargo/bin/"
231235
USER snuba

0 commit comments

Comments
 (0)