Skip to content

Commit 177c4e7

Browse files
authored
Merge pull request #180 from codecrafters-io/andy/vcpkg
[grep] CC-2015: Fix vcpkg caching issue; Update C/C++ Dockerfiles to gcc:15.2.0-trixie
2 parents a4256dc + 0972c9f commit 177c4e7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

dockerfiles/cpp-23.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1.7-labs
2-
FROM gcc:14.3.0-bookworm
2+
FROM gcc:15.2.0-trixie
33

44
# Ensures the container is re-built if dependency files change
55
ENV CODECRAFTERS_DEPENDENCY_FILE_PATHS="CMakeLists.txt,vcpkg.json,vcpkg-configuration.json"
@@ -33,7 +33,7 @@ COPY --exclude=.git --exclude=README.md . /app
3333
RUN vcpkg install --no-print-usage
3434
RUN sed -i '1s/^/set(VCPKG_INSTALL_OPTIONS --no-print-usage)\n/' ${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake
3535

36+
RUN .codecrafters/compile.sh
37+
3638
RUN mkdir -p /app-cached
3739
RUN if [ -d "/app/build" ]; then mv /app/build /app-cached; fi
38-
RUN if [ -d "/app/vcpkg_installed" ]; then mv /app/vcpkg_installed /app-cached/build; fi
39-

0 commit comments

Comments
 (0)