diff --git a/.devcontainer/postcreate.py b/.devcontainer/postcreate.py index 5f19e12..81426ce 100755 --- a/.devcontainer/postcreate.py +++ b/.devcontainer/postcreate.py @@ -7,5 +7,5 @@ parser.add_argument('--build_type') parser.add_argument('--cppstd') args = parser.parse_args() -print ('Executing post-create steps. Build type ', args.build_type. ' C++ standard ' + arg.cppstd) -os.system('conan install /workspaces/network-experiment -of /workspaces/build -s compiler.cppstd= ' + arg.cppstd + ' -s build_type=' + args.build_type) +print ('Executing post-create steps. Build type ', args.build_type, ' C++ standard ', args.cppstd) +os.system('conan install /workspaces/network-experiment -of /workspaces/network-experiment/build -s compiler.cppstd=' + args.cppstd + ' -s build_type=' + args.build_type) diff --git a/devcontainer.Dockerfile b/devcontainer.Dockerfile index f8f341c..858e658 100644 --- a/devcontainer.Dockerfile +++ b/devcontainer.Dockerfile @@ -37,11 +37,10 @@ RUN conan profile detect # avoid expensive rebuilding everytime we need a fresh dev container.. RUN mkdir -p /workspaces/tmp WORKDIR /workspaces/tmp -RUN conan install -s build_type=$BUILD_TYPE -s compiler.cppstd=$COMPILER_CPPSTD -b=* --requires=boost/1.89.0 -o without_cobalt=True -RUN conan install -s build_type=$BUILD_TYPE -s compiler.cppstd=$COMPILER_CPPSTD -b=* --requires=libmagic/5.45 -RUN conan install -s build_type=$BUILD_TYPE -s compiler.cppstd=$COMPILER_CPPSTD -b=* --requires=freetype/2.14.1 -RUN conan install -s build_type=$BUILD_TYPE -s compiler.cppstd=$COMPILER_CPPSTD -b=missing --requires=gtest/1.14.0 -RUN conan install -s build_type=$BUILD_TYPE -s compiler.cppstd=$COMPILER_CPPSTD -b=missing --requires=libjpeg/9f +RUN touch CMakeLists.txt +ADD conanfile.py . +RUN conan install -s build_type=$BUILD_TYPE -s compiler.cppstd=$COMPILER_CPPSTD -b=* + WORKDIR /workspaces RUN rm -rf tmp