Merge pull request #65 from tanghaodong25/master

support gitlab CI/CD
Intel-bigdata · Dec 3, 2019 · 81f2220 · 81f2220
2 parents 0589741 + a492b44
commit 81f2220
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,6 @@
+before_script:
+  - whoami; docker info
+
+build_image:
+  script:
+    - docker build -f docker/ubuntu18/DockerFile --build-arg http_proxy="$http_proxy" --build-arg https_proxy="$http_proxy" --build-arg MAVEN_OPTS="$MAVEN_OPTS" .
diff --git a/ChangeLog b/ChangeLog
diff --git a/docker/ubuntu18/DockerFile b/docker/ubuntu18/DockerFile
@@ -17,5 +17,7 @@ RUN cd /; git clone https://github.com/pmem/pmdk.git
 RUN cd pmdk; git checkout -b 1.6 tags/1.6; make -j; make install -j;
 RUN cd /; git clone https://github.com/efficient/libcuckoo.git
 RUN cd libcuckoo; mkdir build; cd build; cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DBUILD_EXAMPLES=1 -DBUILD_TESTS=1 ..; make -j; make install -j
-RUN cd /; git clone https://github.com/tanghaodong25/Spark-PMoF.git
-RUN cd Spark-PMoF; mvn install -DskipTests
+RUN mkdir /Spark-PMoF
+WORKDIR /Spark-PMoF
+COPY . .
+RUN mvn install -DskipTests