Skip to content

Commit 2701000

Browse files
committed
[DOP-30579] Revert: Improve worker image caching
1 parent fe7c4b7 commit 2701000

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

docker/Dockerfile.worker

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ ENV PYTHONPATH=/app \
1414
POETRY_VIRTUALENVS_IN_PROJECT=1 \
1515
POETRY_VIRTUALENVS_CREATE=1
1616

17+
COPY ./docker/entrypoint_worker.sh /app/entrypoint.sh
18+
RUN chmod +x /app/entrypoint.sh
19+
ENTRYPOINT ["/app/entrypoint.sh"]
20+
1721

1822
FROM base AS builder
1923

@@ -72,11 +76,6 @@ COPY --from=maven_packages --chown=syncmaster:syncmaster /root/.ivy2/ /home/sync
7276

7377
COPY ./syncmaster/ /app/syncmaster/
7478
RUN python -m compileall syncmaster
75-
76-
COPY ./docker/entrypoint_worker.sh /app/entrypoint.sh
77-
RUN chmod +x /app/entrypoint.sh
78-
ENTRYPOINT ["/app/entrypoint.sh"]
79-
8079
USER syncmaster
8180

8281

@@ -94,11 +93,8 @@ RUN --mount=type=cache,target=/root/.cache/pypoetry \
9493

9594
ENV SYNCMASTER__WORKER__CREATE_SPARK_SESSION_FUNCTION=tests.spark.get_worker_spark_session
9695

97-
COPY ./docker/entrypoint_worker.sh /app/entryp
98-
ENTRYPOINT ["/app/entrypoint.sh"]
9996
# Collect coverage from worker
100-
RUN sed -i 's/python -m/coverage run -m/g' /app/entrypoint.shoint.sh
101-
RUN chmod +x /app/entrypoint.sh
97+
RUN sed -i 's/python -m/coverage run -m/g' /app/entrypoint.sh
10298

10399
# Replace kinit binary with dummy, to skip Kerberos interaction in tests
104100
RUN mkdir -p /app/.local/bin && \

0 commit comments

Comments
 (0)