diff --git a/Dockerfile b/Dockerfile index 2d116f4..5ea397a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,21 @@ RUN mkdir -p /solver WORKDIR /solver # Development framework, dependencies -RUN dnf --assumeyes install gcc-c++-13.2.1-7.fc39 make-1:4.4.1-2.fc39 git-core-2.45.0-1.fc39 boost-devel-1.81.0-8.fc39 ccache-4.8.2-2.fc39 qpid-proton-cpp-devel-0.38.0-4.fc39 json-c-0.17-1.fc39 json-devel-3.11.2-3.fc39 json-glib-1.8.0-1.fc39 jsoncpp-1.9.5-5.fc39 jsoncpp-devel-1.9.5-5.fc39 coin-or-Couenne-0.5.8-12.fc39 wget-1.21.3-7.fc39 && \ +RUN dnf --assumeyes update && dnf --assumeyes install \ + gcc-c++ \ + make \ + git-core \ + boost-devel \ + ccache \ + qpid-proton-cpp-devel \ + json-c \ + json-devel \ + json-glib \ + jsoncpp \ + jsoncpp-devel \ + coin-or-Couenne \ + wget \ + && \ dnf clean all && \ git clone https://github.com/jarro2783/cxxopts.git CxxOpts && \ git clone https://github.com/GeirHo/TheronPlusPlus.git Theron++ && \ @@ -36,7 +50,14 @@ RUN make SolverComponent -e THERON=./Theron++ AMPL_INCLUDE=./AMPL/amplapi/includ FROM fedora:39 WORKDIR /solver -RUN dnf --assumeyes install boost-1.81.0-8.fc39 qpid-proton-cpp-0.38.0-4.fc39 json-c-0.17-1.fc39 json-glib-1.8.0-1.fc39 jsoncpp-1.9.5-5.fc39 coin-or-Couenne-0.5.8-12.fc39 && \ +RUN dnf --assumeyes update && dnf --assumeyes install \ + boost \ + qpid-proton-cpp \ + json-c \ + json-glib \ + jsoncpp \ + coin-or-Couenne \ + && \ dnf clean all COPY --from=builder /solver /solver diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 1ea0e32..9112747 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -8,7 +8,7 @@ - nebulous-optimiser-solver-container-images description: Build the container images. files: &image_files - - ^/ + - ^ vars: &image_vars promote_container_image_job: nebulous-optimiser-solver-upload-container-images container_images: