From 1b61d019c028f39fa870acae958f655d4b6a046c Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Thu, 3 Aug 2023 14:25:35 +0200 Subject: [PATCH] Adding CMake to PATH --- Dockerfile | 4 +++- README.md | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d48d4d..9e8d64e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,9 @@ RUN wget https://raw.githubusercontent.com/OpenModelica/OpenModelica-doc/master/ RUN wget cmake.org/files/v3.17/cmake-3.17.2-Linux-x86_64.sh \ && mkdir -p /opt/cmake-3.17.2 \ && sh cmake-3.17.2-Linux-x86_64.sh --prefix=/opt/cmake-3.17.2 --skip-license \ - && rm cmake-3.17.2-Linux-x86_64.sh + && rm cmake-3.17.2-Linux-x86_64.sh \ + && apt-get remove -qy cmake cmake-data +ENV PATH="$PATH:/opt/cmake-3.17.2/bin" # Clean RUN rm -rf /var/lib/apt/lists/* \ diff --git a/README.md b/README.md index 9368448..5173991 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # OpenModelica build-deps Docker Image [![Build v1.16-cmake](https://github.com/AnHeuermann/build-deps/actions/workflows/build.yml/badge.svg?branch=releases%2Fv1.16-cmake)](https://github.com/AnHeuermann/build-deps/actions/workflows/build.yml) -[![Publish v1.16-cmake](https://github.com/AnHeuermann/build-deps/actions/workflows/publish.yml/badge.svg?branch=releases%2Fv1.16-cmake)](https://github.com/AnHeuermann/build-deps/actions/workflows/publish.yml) The Docker image used to build and deploy [OpenModelica](https://github.com/OpenModelica/OpenModelica) with @@ -11,7 +10,7 @@ Jenkins[https://test.openmodelica.org/jenkins/]. ```bash export TAG=v1.16.3-cmake -docker build --pull --no-cache --tag build-deps:$(TAG) . +docker build --pull --no-cache --tag build-deps:$TAG . ``` ## Upload @@ -26,7 +25,7 @@ Otherwise run: export REGISTRY=anheuermann export TAG=v1.16.3-cmake docker login -docker image tag build-deps:$(VERSION) $(REGISTRY)/build-deps:$(TAG) +docker image tag build-deps:$(VERSION) $(REGISTRY)/build-deps:$TAG ``` ## License