Merge pull request #308 from g0ldyy/master

Fix Dockerfile resource paths for correct build context
This commit is contained in:
euzu
2025-06-20 14:02:30 +02:00
committed by GitHub
+6 -6
View File
@@ -129,7 +129,7 @@ RUN rustup update && rustup target add $RUST_TARGET
# Create the final application layout to mimic production
WORKDIR /app
COPY --from=node-build /app/build ./web
COPY --from=resource-build //resources ./resources
COPY --from=resource-build /src/resources ./resources
# Create a separate directory for the source code
WORKDIR /usr/src/tuliprox
@@ -162,9 +162,9 @@ COPY --from=rust-build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
# App
WORKDIR /app
COPY --from=rust-build //target/${RUST_TARGET}/release/tuliprox ./tuliprox
COPY --from=rust-build /src/target/${RUST_TARGET}/release/tuliprox ./tuliprox
COPY --from=node-build /app/build ./web
COPY --from=resource-build //resources ./resources
COPY --from=resource-build /src/resources ./resources
ENTRYPOINT ["/app/tuliprox"]
CMD ["-s", "-p", "/app/config"]
@@ -187,9 +187,9 @@ COPY --from=rust-build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime
WORKDIR /app
COPY --from=rust-build //target/${RUST_TARGET}/release/tuliprox ./tuliprox
COPY --from=rust-build /src/target/${RUST_TARGET}/release/tuliprox ./tuliprox
COPY --from=node-build /app/build ./web
COPY --from=resource-build //resources ./resources
COPY --from=resource-build /src/resources ./resources
ENTRYPOINT ["/sbin/tini", "--", "/app/tuliprox"]
CMD ["-s", "-p", "/app/config"]
CMD ["-s", "-p", "/app/config"]