From cf5a937b6785646eb21ac2c9a7c5961ba7a5ae1a Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Wed, 9 Jun 2021 13:29:23 +0200 Subject: [PATCH] WIP: pipeline --- .docker/Dockerfile | 2 +- .gitlab-ci.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 17f34da..70c37e0 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -7,7 +7,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh WORKDIR /libcaosdb/ RUN mkdir build WORKDIR /libcaosdb/build -RUN cmake -D INSTALL_DIR_NAME=libcaosdb.. +RUN cmake -D INSTALL_DIR_NAME=libcaosdb .. RUN cmake --build . RUN cmake --install . --prefix /usr/local/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49356e2..a286272 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,6 +42,7 @@ variables: # This is the caosdb-deploy branch which build the images for caosdb-server and caosdb-mysql # TODO change to dev after merge of f-grpc to dev DEPLOY_REF: f-grpc + CAOSDB_TAG: f-grpc_F_f-grpc_C_main_IC_main stages: - info -- GitLab