Revert changes to server & scheduler images

Author: dolfinus

docker/Dockerfile.scheduler

@@ -3,14 +3,13 @@
 ARG PYTHON_VERSION=3.13
 FROM python:$PYTHON_VERSION-slim-bookworm AS base
 
-RUN useradd syncmaster --create-home && \
-    mkdir -p /home/syncmaster && \
-    chown -R syncmaster:syncmaster /home/syncmaster
-
 WORKDIR /app
 ENV PYTHONPATH=/app \
     PATH="/app/.venv/bin:$PATH"
 
+COPY --chmod=755 ./docker/entrypoint_scheduler.sh /app/entrypoint.sh
+ENTRYPOINT ["/app/entrypoint.sh"]
+
 
 FROM base AS builder
 
@@ -33,12 +32,10 @@ FROM base AS prod
 COPY --link --from=builder /app/.venv/ /app/.venv/
 COPY ./syncmaster/ /app/syncmaster/
 RUN python -m compileall -b /app/syncmaster
-COPY ./pyproject.toml ./uv.lock /app/syncmaster/
 
-COPY --chmod=755 ./docker/entrypoint_scheduler.sh /app/entrypoint.sh
-ENTRYPOINT ["/app/entrypoint.sh"]
 # Do not run production as root, to improve security.
 # Also user does not own anything inside the image, including venv and source code.
+RUN useradd syncmaster
 USER syncmaster
 
 
@@ -54,6 +51,4 @@ RUN --mount=type=cache,target=/root/.cache/uv \
         --group "test" \
         --compile-bytecode
 
-COPY --chmod=755 ./docker/entrypoint_scheduler.sh /app/entrypoint.sh
 RUN sed -i 's/python -m/coverage run -m/g' /app/entrypoint.sh
-ENTRYPOINT ["/app/entrypoint.sh"]

docker/Dockerfile.server

@@ -9,14 +9,29 @@ RUN apt-get update \
         curl \
     && rm -rf /var/lib/apt/lists/* /var/cache/*
 
-RUN useradd syncmaster --create-home && \
-    mkdir -p /home/syncmaster && \
-    chown -R syncmaster:syncmaster /home/syncmaster
-
 WORKDIR /app
 ENV PYTHONPATH=/app \
     PATH="/app/.venv/bin:$PATH"
 
+COPY ./docs/_static/*.svg /app/syncmaster/server/static/
+
+# Swagger UI
+ADD --chmod=644 https://cdn.jsdelivr.net/npm/swagger-ui-dist@latest/swagger-ui-bundle.js https://cdn.jsdelivr.net/npm/swagger-ui-dist@latest/swagger-ui.css \
+    /app/syncmaster/server/static/swagger/
+
+# Redoc
+ADD --chmod=644 https://cdn.jsdelivr.net/npm/redoc@latest/bundles/redoc.standalone.js /app/syncmaster/server/static/redoc/redoc.standalone.js
+
+ENV SYNCMASTER__SERVER__OPENAPI__SWAGGER__JS_URL=/static/swagger/swagger-ui-bundle.js \
+    SYNCMASTER__SERVER__OPENAPI__SWAGGER__CSS_URL=/static/swagger/swagger-ui.css \
+    SYNCMASTER__SERVER__OPENAPI__REDOC__JS_URL=/static/redoc/redoc.standalone.js \
+    SYNCMASTER__SERVER__STATIC_FILES__DIRECTORY=/app/syncmaster/server/static
+
+COPY --chmod=755 ./docker/entrypoint_server.sh /app/entrypoint.sh
+ENTRYPOINT ["/app/entrypoint.sh"]
+EXPOSE 8000
+HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 CMD ["curl", "-f", "http://localhost:8000/monitoring/ping"]
+
 
 FROM base AS builder
 
@@ -36,30 +51,12 @@ FROM base AS prod
 
 COPY --link --from=builder /app/.venv/ /app/.venv/
 
-COPY ./docs/_static/*.svg /app/syncmaster/server/static/
-
-# Swagger UI
-ADD https://cdn.jsdelivr.net/npm/swagger-ui-dist@latest/swagger-ui-bundle.js https://cdn.jsdelivr.net/npm/swagger-ui-dist@latest/swagger-ui.css \
-    /app/syncmaster/server/static/swagger/
-
-# Redoc
-ADD https://cdn.jsdelivr.net/npm/redoc@latest/bundles/redoc.standalone.js /app/syncmaster/server/static/redoc/redoc.standalone.js
-
-ENV SYNCMASTER__SERVER__OPENAPI__SWAGGER__JS_URL=/static/swagger/swagger-ui-bundle.js \
-    SYNCMASTER__SERVER__OPENAPI__SWAGGER__CSS_URL=/static/swagger/swagger-ui.css \
-    SYNCMASTER__SERVER__OPENAPI__REDOC__JS_URL=/static/redoc/redoc.standalone.js \
-    SYNCMASTER__SERVER__STATIC_FILES__DIRECTORY=/app/syncmaster/server/static
-
 COPY ./syncmaster/ /app/syncmaster/
 RUN python -m compileall -b /app/syncmaster
-COPY ./pyproject.toml ./uv.lock /app/syncmaster/
 
-COPY --chmod=755 ./docker/entrypoint_scheduler.sh /app/entrypoint.sh
-ENTRYPOINT ["/app/entrypoint.sh"]
-EXPOSE 8000
-HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 CMD ["curl", "-f", "http://localhost:8000/monitoring/ping"]
 # Do not run production as root, to improve security.
 # Also user does not own anything inside the image, including venv and source code.
+RUN useradd syncmaster
 USER syncmaster
 
 
@@ -74,8 +71,4 @@ RUN --mount=type=cache,target=/root/.cache/uv \
         --group "test" \
         --compile-bytecode
 
-COPY --chmod=755 ./docker/entrypoint_server.sh /app/entrypoint.sh
 RUN sed -i 's/python -m/coverage run -m/g' /app/entrypoint.sh
-ENTRYPOINT ["/app/entrypoint.sh"]
-EXPOSE 8000
-HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 CMD ["curl", "-f", "http://localhost:8000/monitoring/ping"]

docker/Dockerfile.worker

@@ -20,6 +20,9 @@ WORKDIR /app
 ENV PYTHONPATH=/app \
     PATH="/app/.venv/bin:$PATH"
 
+COPY --chmod=755 ./docker/entrypoint_worker.sh /app/entrypoint.sh
+ENTRYPOINT ["/app/entrypoint.sh"]
+
 
 FROM base AS builder
 
@@ -94,12 +97,10 @@ COPY --link --from=builder /app/.venv/ /app/.venv/
 # using --link to make ~/.ivy2 a separated layer in docker image, not based on previous layers
 COPY --link --from=ivy2_packages /home/syncmaster/.ivy2/ /home/syncmaster/.ivy2/
 # If someone needs to use worker image with root user, use the same jars
-RUN mkdir -p /root && ln -s /home/syncmaster/.ivy2 /root/.ivy2
+RUN mkdir -p /root && ln -s /home/syncmaster/.ivy2 /root/.ivy2_packages
 
-COPY --chmod=755 ./docker/entrypoint_worker.sh /app/entrypoint.sh
 COPY ./syncmaster/ /app/syncmaster/
 RUN python -m compileall /app/syncmaster
-ENTRYPOINT ["/app/entrypoint.sh"]
 # Do not run production as root, to improve security.
 # Also user does not own anything inside the image, including venv and source code.
 USER syncmaster
@@ -119,9 +120,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
         --group "test" \
         --compile-bytecode
 
-COPY --chmod=755 ./docker/entrypoint_worker.sh /app/entrypoint.sh
 RUN sed -i 's/python -m/coverage run -m/g' /app/entrypoint.sh
-ENTRYPOINT ["/app/entrypoint.sh"]
 
 # Replace kinit binary with dummy, to skip Kerberos interaction in tests
 RUN mkdir -p /app/.local/bin && \