From c95f185b30fdc65d6c93d99a9b03ed9d66fa1729 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 28 Jun 2021 12:53:04 +0200
Subject: [PATCH] WIP: pipeline
---
.docker/Dockerfile | 2 ++
.gitlab-ci.yml | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index e7becb0..29fc362 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -15,6 +15,8 @@ COPY . /caosdb-cppinttest
WORKDIR /caosdb-cppinttest
RUN rm -rf .git
+RUN apt-get install -y openjdk-11-jdk-headless
+
# build and run tests
CMD mkdir build && \
cd build && \
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d07eaa..710b66c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,7 +104,7 @@ build-testenv-changes-docker:
<<: *build-testenv
only:
changes:
- - docker/*
+ - .docker/*
build-testenv-triggered:
<<: *build-testenv
--
GitLab