From 889c60120a17defe772b395425f0d0cf8637d381 Mon Sep 17 00:00:00 2001 From: Paul Kuruvilla Date: Wed, 14 Aug 2024 14:17:26 +0100 Subject: [PATCH] replace-submission-dir --- dockerfiles/cpp-23.Dockerfile | 2 +- dockerfiles/dotnet-6.0.Dockerfile | 2 +- dockerfiles/dotnet-8.0.Dockerfile | 2 +- dockerfiles/haskell-9.4.Dockerfile | 2 +- dockerfiles/java-21.Dockerfile | 2 +- dockerfiles/rust-1.70.Dockerfile | 2 +- dockerfiles/rust-1.76.Dockerfile | 2 +- dockerfiles/rust-1.77.Dockerfile | 2 +- dockerfiles/zig-0.12.Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dockerfiles/cpp-23.Dockerfile b/dockerfiles/cpp-23.Dockerfile index c23355e..447fcbc 100644 --- a/dockerfiles/cpp-23.Dockerfile +++ b/dockerfiles/cpp-23.Dockerfile @@ -36,5 +36,5 @@ RUN mkdir -p /app-cached/build RUN if [ -d "/app/build" ]; then mv /app/build /app-cached; fi RUN if [ -d "/app/vcpkg_installed" ]; then mv /app/vcpkg_installed /app-cached/build; fi -RUN echo "cd \${CODECRAFTERS_SUBMISSION_DIR} && cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake && cmake --build ./build && sed -i '/^cmake/ s/^/# /' ./your_server.sh" > /codecrafters-precompile.sh +RUN echo "cd \${CODECRAFTERS_REPOSITORY_DIR} && cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake && cmake --build ./build && sed -i '/^cmake/ s/^/# /' ./your_server.sh" > /codecrafters-precompile.sh RUN chmod +x /codecrafters-precompile.sh diff --git a/dockerfiles/dotnet-6.0.Dockerfile b/dockerfiles/dotnet-6.0.Dockerfile index 2349e09..37e8687 100644 --- a/dockerfiles/dotnet-6.0.Dockerfile +++ b/dockerfiles/dotnet-6.0.Dockerfile @@ -18,7 +18,7 @@ RUN rm /app/src/Program.cs RUN rm -rf /app/obj RUN rm -rf /app/bin -RUN echo "cd \${CODECRAFTERS_SUBMISSION_DIR} && dotnet build --configuration Release ." > /codecrafters-precompile.sh +RUN echo "cd \${CODECRAFTERS_REPOSITORY_DIR} && dotnet build --configuration Release ." > /codecrafters-precompile.sh RUN chmod +x /codecrafters-precompile.sh ENV CODECRAFTERS_DEPENDENCY_FILE_PATHS="codecrafters-http-server.csproj,codecrafters-http-server.sln" diff --git a/dockerfiles/dotnet-8.0.Dockerfile b/dockerfiles/dotnet-8.0.Dockerfile index b04f3fe..c36a47b 100644 --- a/dockerfiles/dotnet-8.0.Dockerfile +++ b/dockerfiles/dotnet-8.0.Dockerfile @@ -13,5 +13,5 @@ COPY --exclude=.git --exclude=README.md . /app RUN dotnet build --configuration Release . # Legacy support, remove in the next version of this dockerfile -RUN echo "cd \${CODECRAFTERS_SUBMISSION_DIR} && dotnet build --configuration Release ." > /codecrafters-precompile.sh +RUN echo "cd \${CODECRAFTERS_REPOSITORY_DIR} && dotnet build --configuration Release ." > /codecrafters-precompile.sh RUN chmod +x /codecrafters-precompile.sh diff --git a/dockerfiles/haskell-9.4.Dockerfile b/dockerfiles/haskell-9.4.Dockerfile index 9fd86be..f5b8b8f 100644 --- a/dockerfiles/haskell-9.4.Dockerfile +++ b/dockerfiles/haskell-9.4.Dockerfile @@ -26,7 +26,7 @@ RUN cp -r .stack-work /tmp/ RUN rm -rf /app/app RUN rm -rf /app/src -RUN echo "cd \${CODECRAFTERS_SUBMISSION_DIR} && cp -r /tmp/.stack-work . && stack build" > /codecrafters-precompile.sh +RUN echo "cd \${CODECRAFTERS_REPOSITORY_DIR} && cp -r /tmp/.stack-work . && stack build" > /codecrafters-precompile.sh RUN chmod +x /codecrafters-precompile.sh ENV CODECRAFTERS_DEPENDENCY_FILE_PATHS="stack.yaml,package.yaml,stack.yaml.lock" diff --git a/dockerfiles/java-21.Dockerfile b/dockerfiles/java-21.Dockerfile index 8b64ef0..288a412 100644 --- a/dockerfiles/java-21.Dockerfile +++ b/dockerfiles/java-21.Dockerfile @@ -13,5 +13,5 @@ RUN mv /app/target /app-cached # Is this needed? # Pre-compile steps # Note: Previously, /tmp/codecrafters-http-target was hardcoded in your_server.sh. We've now switched to using /tmp/codecrafters-build-http-server-java -RUN printf "cd \${CODECRAFTERS_SUBMISSION_DIR} && mvn -B package -Ddir=/tmp/codecrafters-build-http-server-java && sed -i 's/^\(mvn .*\)/#\1/' ./your_server.sh && sed -i 's|/tmp/codecrafters-http-target|/tmp/codecrafters-build-http-server-java|g' ./your_server.sh" > /codecrafters-precompile.sh +RUN printf "cd \${CODECRAFTERS_REPOSITORY_DIR} && mvn -B package -Ddir=/tmp/codecrafters-build-http-server-java && sed -i 's/^\(mvn .*\)/#\1/' ./your_server.sh && sed -i 's|/tmp/codecrafters-http-target|/tmp/codecrafters-build-http-server-java|g' ./your_server.sh" > /codecrafters-precompile.sh RUN chmod +x /codecrafters-precompile.sh \ No newline at end of file diff --git a/dockerfiles/rust-1.70.Dockerfile b/dockerfiles/rust-1.70.Dockerfile index d818895..a03c126 100644 --- a/dockerfiles/rust-1.70.Dockerfile +++ b/dockerfiles/rust-1.70.Dockerfile @@ -13,7 +13,7 @@ RUN cargo clean -p http-server-starter-rust --release --target-dir=/tmp/codecraf RUN rm -rf /app/src -RUN echo "cd \${CODECRAFTERS_SUBMISSION_DIR} && cargo build --release --target-dir=/tmp/codecrafters-http-server-target --manifest-path Cargo.toml" > /codecrafters-precompile.sh +RUN echo "cd \${CODECRAFTERS_REPOSITORY_DIR} && cargo build --release --target-dir=/tmp/codecrafters-http-server-target --manifest-path Cargo.toml" > /codecrafters-precompile.sh RUN chmod +x /codecrafters-precompile.sh ENV CODECRAFTERS_DEPENDENCY_FILE_PATHS="Cargo.toml,Cargo.lock" diff --git a/dockerfiles/rust-1.76.Dockerfile b/dockerfiles/rust-1.76.Dockerfile index 750d748..e6395a4 100644 --- a/dockerfiles/rust-1.76.Dockerfile +++ b/dockerfiles/rust-1.76.Dockerfile @@ -13,7 +13,7 @@ RUN cargo clean -p http-server-starter-rust --release --target-dir=/tmp/codecraf RUN rm -rf /app/src -RUN echo "cd \${CODECRAFTERS_SUBMISSION_DIR} && cargo build --release --target-dir=/tmp/codecrafters-http-server-target --manifest-path Cargo.toml" > /codecrafters-precompile.sh +RUN echo "cd \${CODECRAFTERS_REPOSITORY_DIR} && cargo build --release --target-dir=/tmp/codecrafters-http-server-target --manifest-path Cargo.toml" > /codecrafters-precompile.sh RUN chmod +x /codecrafters-precompile.sh ENV CODECRAFTERS_DEPENDENCY_FILE_PATHS="Cargo.toml,Cargo.lock" diff --git a/dockerfiles/rust-1.77.Dockerfile b/dockerfiles/rust-1.77.Dockerfile index 81974c3..bf2c3ea 100644 --- a/dockerfiles/rust-1.77.Dockerfile +++ b/dockerfiles/rust-1.77.Dockerfile @@ -9,7 +9,7 @@ COPY --exclude=.git --exclude=README.md . /app RUN cargo build --release --target-dir=/tmp/codecrafters-http-server-target RUN cargo clean -p http-server-starter-rust --release --target-dir=/tmp/codecrafters-http-server-target -RUN echo "cd \${CODECRAFTERS_SUBMISSION_DIR} && cargo build --release --target-dir=/tmp/codecrafters-http-server-target --manifest-path Cargo.toml" > /codecrafters-precompile.sh +RUN echo "cd \${CODECRAFTERS_REPOSITORY_DIR} && cargo build --release --target-dir=/tmp/codecrafters-http-server-target --manifest-path Cargo.toml" > /codecrafters-precompile.sh RUN chmod +x /codecrafters-precompile.sh ENV CODECRAFTERS_DEPENDENCY_FILE_PATHS="Cargo.toml,Cargo.lock" diff --git a/dockerfiles/zig-0.12.Dockerfile b/dockerfiles/zig-0.12.Dockerfile index 6dbc92a..0e166b0 100644 --- a/dockerfiles/zig-0.12.Dockerfile +++ b/dockerfiles/zig-0.12.Dockerfile @@ -17,5 +17,5 @@ RUN echo "@community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /et # Update the package list and install Zig RUN apk add --no-cache zig@community=0.12.0-r0 -RUN printf "set -e \ncd \${CODECRAFTERS_SUBMISSION_DIR} \necho 'Running zig build' \nzig build \necho 'zig build completed.' \n" > /codecrafters-precompile.sh +RUN printf "set -e \ncd \${CODECRAFTERS_REPOSITORY_DIR} \necho 'Running zig build' \nzig build \necho 'zig build completed.' \n" > /codecrafters-precompile.sh RUN chmod +x /codecrafters-precompile.sh \ No newline at end of file