From 85912a17eceb7d2d45bfbf6a224b9b43040c5552 Mon Sep 17 00:00:00 2001
From: Tomas Pecka <peckato1@fit.cvut.cz>
Date: Fri, 23 Nov 2018 08:40:33 +0100
Subject: [PATCH] Dockerfile: Proper make install
---
.gitlab-ci.yml | 4 ++--
extra/docker/master/Dockerfile | 12 ++++--------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ad147ae35..83a13097db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,7 +107,7 @@ docker:build-nightly:
- schedules
script:
- docker build -t "$IMAGE_TAG_NIGHTLY" .
- - docker run "$IMAGE_TAG_NIGHTLY" /app/bin/aql2 --help
+ - docker run "$IMAGE_TAG_NIGHTLY" /usr/bin/aql2 --help
- docker push "$IMAGE_TAG_NIGHTLY"
docker:build-release:
@@ -118,6 +118,6 @@ docker:build-release:
- branches
script:
- docker build -t "$IMAGE_TAG_RELEASE" -t "$IMAGE_TAG_LATEST" .
- - docker run "$IMAGE_TAG_RELEASE" /app/bin/aql2 --help
+ - docker run "$IMAGE_TAG_RELEASE" /usr/bin/aql2 --help
- docker push "$IMAGE_TAG_RELEASE"
- docker push "$IMAGE_TAG_LATEST"
diff --git a/extra/docker/master/Dockerfile b/extra/docker/master/Dockerfile
index 059bcd780f..ab2c1706bd 100644
--- a/extra/docker/master/Dockerfile
+++ b/extra/docker/master/Dockerfile
@@ -27,7 +27,7 @@ RUN CMake/generate.py -wm
WORKDIR $BASEDIR/release
RUN cmake \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr/local \
+ -DCMAKE_INSTALL_PREFIX=$BASEDIR/install \
.. && \
make -j $(grep -c processor /proc/cpuinfo) && \
make test && \
@@ -38,10 +38,7 @@ RUN cmake \
# deploy stage
FROM alpine:3.8
-LABEL maintainer="tomas.pecka@fit.cvut.cz"
-
-ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/app/lib"
-ENV PATH="${PATH}:/app/bin"
+LABEL maintainer="peckato1@fit.cvut.cz"
RUN apk add --update \
bash \
@@ -55,7 +52,6 @@ RUN apk add --update \
graphviz \
jsoncpp
-COPY --from=builder /usr/local/bin /app/bin
-COPY --from=builder /usr/local/lib /app/lib
+COPY --from=builder /build/install /usr
-CMD aql2
+CMD /usr/bin/aql2
--
GitLab