From a7d3a296ee6cdcb058633994266dcd1379006d2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@inrae.fr>
Date: Tue, 30 Jun 2020 12:29:39 +0200
Subject: [PATCH] Retravaille l'image Docker.
---
.dockerignore | 12 ++++++++----
.gitlab-ci.yml | 3 +--
Dockerfile | 12 +++---------
bin/prezbuilder-docker | 6 +++---
4 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/.dockerignore b/.dockerignore
index 2b5e51a..f8f914d 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,8 @@
-/node_modules
-/public
-/Dockerfile
-/.?*
+*
+.?*
+!assets/
+!bin/prezbuilder
+!gulpfile.esm.js/
+!lib/
+!package*.json
+!templates/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71fa2bb..b5ab44e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,8 +34,7 @@ docker-image:
script:
- set -x
- docker pull "${IMAGE}" || exit 0
- - docker build --cache-from "node:buster-12,${IMAGE}" --tag "${IMAGE}" .
- - docker run --rm "${IMAGE}" build
+ - docker build --cache-from "${IMAGE}" --tag "${IMAGE}" .
- bash -x bin/prezbuilder-docker build src public
- "[ -e public/index.html ]"
- docker push "${IMAGE}"
diff --git a/Dockerfile b/Dockerfile
index 762a38e..85fa4f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,21 +41,15 @@ RUN wget -nv -O /tmp/wkhtmltox.deb https://github.com/wkhtmltopdf/wkhtmltopdf/re
&& rm /tmp/wkhtmltox.deb \
&& wkhtmltopdf --version
-RUN mkdir -p /src /opt/prezbuilder
+RUN mkdir -p /workdir/src /workdir/public /opt/prezbuilder
COPY --from=builder /opt/prezbuilder /opt/prezbuilder/
-COPY src/ /src/
ENV SERVER_HOST=0.0.0.0 \
SERVER_PORT=3000 \
- SRC=/src \
- OUTPUT=/public \
WKHTMLTOPDF_BINARY=/usr/local/bin/wkhtmltopdf
-RUN mkdir -p -m 0777 $OUTPUT \
- && ln -s /opt/prezbuilder/bin/prezbuilder /usr/local/bin/prezbuilder
-
-WORKDIR /src
+WORKDIR /workdir
EXPOSE 3000/tcp 35729/tcp
-ENTRYPOINT ["/usr/local/bin/prezbuilder"]
+ENTRYPOINT ["/opt/prezbuilder/bin/prezbuilder"]
CMD ["dev"]
diff --git a/bin/prezbuilder-docker b/bin/prezbuilder-docker
index d0937f8..502a493 100755
--- a/bin/prezbuilder-docker
+++ b/bin/prezbuilder-docker
@@ -3,9 +3,9 @@ exec docker run \
--rm -t \
--init \
-u `id -u`:`id -g` \
- -v `readlink -f ${2:-src}`:/src:ro \
- -v `readlink -f ${3:-public}`:/public \
+ -v `readlink -f ${2:-src}`:/workdir/src:ro \
+ -v `readlink -f ${3:-public}`:/workdir/public \
-p 3000:3000/tcp \
-p 35729:35729/tcp \
"${PREZBUILDER_IMAGE:-gitlab-registry.irstea.fr/pole-is/tools/prezbuilder}:${PREZBUILDER_TAG:-master}" \
- "${1:-build}" /src /public
+ "${1:-build}" /workdir/src /workdir/public
--
GitLab