diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 17f34da1835b63726bd3fa7770722d0456eba179..70c37e0b0e5e95870a08fecaf7c1c747413b49fc 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 49356e2b2c76d5790c59843fcc730ba158acf750..a2862726cf1828cb7ab48b49c9e9f3660203e580 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