From 5e401d6562ce725a37767c7cbe87cb3433279c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Mon, 13 Jun 2016 10:08:53 +0200 Subject: [PATCH 01/28] update dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5400877..af1d9d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN cd $(npm root -g)/npm \ && sed -i -e s/graceful-fs/fs-extra/ -e s/fs.rename/fs.move/ ./lib/utils/rename.js RUN LEIN_ROOT=true lein uberjar -COPY target/*-standalone.jar $APP_HOME +COPY $APP_TEMP_HOME/target/*-standalone.jar $APP_HOME COPY config.edn $APP_HOME From e8bc167421ad7dbcd3d45f6f4dd7a56bf1f4b95f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Mon, 13 Jun 2016 10:31:06 +0200 Subject: [PATCH 02/28] update dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index af1d9d8..7ee359b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN cd $(npm root -g)/npm \ && sed -i -e s/graceful-fs/fs-extra/ -e s/fs.rename/fs.move/ ./lib/utils/rename.js RUN LEIN_ROOT=true lein uberjar -COPY $APP_TEMP_HOME/target/*-standalone.jar $APP_HOME +COPY target/*-standalone.jar $APP_HOME ||| CONTINUE with warning COPY config.edn $APP_HOME From 877ca97c2785eb6f24b56b6a6b67113e552bced2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Mon, 13 Jun 2016 11:04:03 +0200 Subject: [PATCH 03/28] fix dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7ee359b..fdcb4d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,11 +11,11 @@ RUN npm install -g grunt-cli RUN apt-get -y install wget RUN wget -q -O /usr/bin/lein https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein && chmod +x /usr/bin/lein && lein -ENV APP_HOME=/usr/local/visualreview -ENV APP_TEMP_HOME=/usr/local/visualreviewTemp +ENV APP_HOME /usr/local/visualreview +ENV APP_TEMP_HOME /usr/local/visualreviewTemp RUN mkdir -p $APP_HOME -RUN mkdir -p APP_TEMP_HOME +RUN mkdir -p $APP_TEMP_HOME WORKDIR $APP_TEMP_HOME From df47ef024b2c64deb2ceb4b18dbed4b2b72b5d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Mon, 13 Jun 2016 11:21:29 +0200 Subject: [PATCH 04/28] fix dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fdcb4d8..348e031 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN cd $(npm root -g)/npm \ && sed -i -e s/graceful-fs/fs-extra/ -e s/fs.rename/fs.move/ ./lib/utils/rename.js RUN LEIN_ROOT=true lein uberjar -COPY target/*-standalone.jar $APP_HOME ||| CONTINUE with warning +ADD target/*-standalone.jar $APP_HOME ||| CONTINUE with warning COPY config.edn $APP_HOME From 24eb02bac0c8ce6867b75e54277c013babbc9b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Mon, 13 Jun 2016 12:09:05 +0200 Subject: [PATCH 05/28] fix dockerfile --- Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 348e031..fd1ddf8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,22 +14,23 @@ RUN wget -q -O /usr/bin/lein https://raw.githubusercontent.com/technomancy/l ENV APP_HOME /usr/local/visualreview ENV APP_TEMP_HOME /usr/local/visualreviewTemp -RUN mkdir -p $APP_HOME -RUN mkdir -p $APP_TEMP_HOME +# RUN mkdir -p ${APP_HOME} +# RUN mkdir -p ${APP_TEMP_HOME} -WORKDIR $APP_TEMP_HOME +WORKDIR ${APP_HOME} +WORKDIR ${APP_TEMP_HOME} # add source -ADD . $APP_TEMP_HOME +ADD . ${APP_TEMP_HOME} RUN cd $(npm root -g)/npm \ && npm install fs-extra \ && sed -i -e s/graceful-fs/fs-extra/ -e s/fs.rename/fs.move/ ./lib/utils/rename.js RUN LEIN_ROOT=true lein uberjar -ADD target/*-standalone.jar $APP_HOME ||| CONTINUE with warning +COPY target/*-standalone.jar ${APP_HOME} ||| CONTINUE with warning -COPY config.edn $APP_HOME +COPY config.edn ${APP_HOME} RUN rm -fr $APP_TEMP_HOME From fd610d0dee9bb35b337bdf3399c38157572eac36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Mon, 13 Jun 2016 13:14:41 +0200 Subject: [PATCH 06/28] fix dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fd1ddf8..8f062f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,7 @@ RUN cd $(npm root -g)/npm \ && sed -i -e s/graceful-fs/fs-extra/ -e s/fs.rename/fs.move/ ./lib/utils/rename.js RUN LEIN_ROOT=true lein uberjar -COPY target/*-standalone.jar ${APP_HOME} ||| CONTINUE with warning +COPY target/*-standalone.jar /usr/local/visualreview ||| CONTINUE with warning COPY config.edn ${APP_HOME} From 049b246b49f6927553e351eb0765d68f38f1d1ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Mon, 13 Jun 2016 13:55:43 +0200 Subject: [PATCH 07/28] fix dockerfile again .... --- Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f062f1..cbcd843 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ENV APP_TEMP_HOME /usr/local/visualreviewTemp # RUN mkdir -p ${APP_HOME} # RUN mkdir -p ${APP_TEMP_HOME} -WORKDIR ${APP_HOME} + WORKDIR ${APP_TEMP_HOME} # add source @@ -28,13 +28,16 @@ RUN cd $(npm root -g)/npm \ && sed -i -e s/graceful-fs/fs-extra/ -e s/fs.rename/fs.move/ ./lib/utils/rename.js RUN LEIN_ROOT=true lein uberjar -COPY target/*-standalone.jar /usr/local/visualreview ||| CONTINUE with warning -COPY config.edn ${APP_HOME} +WORKDIR ${APP_HOME} +ADD . ${APP_TEMP_HOME}/target/*-standalone.jar ${APP_HOME} +# COPY target/*-standalone.jar /usr/local/visualreview ||| CONTINUE with warning + +COPY ${APP_TEMP_HOME}/config.edn . RUN rm -fr $APP_TEMP_HOME -WORKDIR $APP_HOME +# WORKDIR $APP_HOME RUN mv `ls *-standalone.jar` app-standalone.jar # RUN mkdir -p $APP_HOME From 11305d6d09f1abf8c861a4f34082a2530ddce49b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Mon, 13 Jun 2016 14:12:14 +0200 Subject: [PATCH 08/28] fix dockerfile again snifff .... --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cbcd843..f28924b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,10 +30,10 @@ RUN cd $(npm root -g)/npm \ RUN LEIN_ROOT=true lein uberjar WORKDIR ${APP_HOME} -ADD . ${APP_TEMP_HOME}/target/*-standalone.jar ${APP_HOME} +ADD ${APP_TEMP_HOME}/target/*-standalone.jar ${APP_HOME} # COPY target/*-standalone.jar /usr/local/visualreview ||| CONTINUE with warning -COPY ${APP_TEMP_HOME}/config.edn . +ADD ${APP_TEMP_HOME}/config.edn . RUN rm -fr $APP_TEMP_HOME From 55dec1005902430ad716fe10f0e921096fb280fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Mon, 13 Jun 2016 14:31:01 +0200 Subject: [PATCH 09/28] fix dockerfile again snifff .... --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f28924b..cb71212 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,10 +30,10 @@ RUN cd $(npm root -g)/npm \ RUN LEIN_ROOT=true lein uberjar WORKDIR ${APP_HOME} -ADD ${APP_TEMP_HOME}/target/*-standalone.jar ${APP_HOME} +RUN mv ${APP_TEMP_HOME}/target/*-standalone.jar ${APP_HOME} # COPY target/*-standalone.jar /usr/local/visualreview ||| CONTINUE with warning -ADD ${APP_TEMP_HOME}/config.edn . +RUN cp ${APP_TEMP_HOME}/config.edn . RUN rm -fr $APP_TEMP_HOME From a5fdaaeffb71b8c5d3d036372e1714359eb2d612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Mon, 13 Jun 2016 16:43:29 +0200 Subject: [PATCH 10/28] try to slim docker image --- Dockerfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cb71212..591b9b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node +FROM node:slim EXPOSE 7000 RUN apt-get -y update && apt-get -y upgrade RUN apt-get -y install openjdk-7-jdk @@ -42,11 +42,17 @@ RUN mv `ls *-standalone.jar` app-standalone.jar # RUN mkdir -p $APP_HOME +# remove openjdk and install openjreheadless +RUN apt-get remove -y openjdk-7-jdk \ + && apt-get -y install openjdk-7-jre-headless + + # clean RUN apt-get remove -y wget \ && apt-get clean \ && apt-get autoremove -y \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ + && rm -fr /root/.cache /root/.lein /root/.m2 /root/.npm /root/.node-gyp CMD ["java", "-jar", "app-standalone.jar"] From bfd3e465414162fb87150011f8417136f9f70ca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Mon, 13 Jun 2016 16:57:04 +0200 Subject: [PATCH 11/28] try to slim docker image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 591b9b9..184496c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:slim +FROM node EXPOSE 7000 RUN apt-get -y update && apt-get -y upgrade RUN apt-get -y install openjdk-7-jdk From 017dcdd16436c4c04762dbab35e98665b2bd7a72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Tue, 14 Jun 2016 10:28:04 +0200 Subject: [PATCH 12/28] trying to reduce docker image size --- Dockerfile | 61 ++++++++++++++++++++---------------------------------- 1 file changed, 23 insertions(+), 38 deletions(-) diff --git a/Dockerfile b/Dockerfile index 184496c..54f1c22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,19 @@ FROM node EXPOSE 7000 -RUN apt-get -y update && apt-get -y upgrade -RUN apt-get -y install openjdk-7-jdk - -RUN npm install bower -g - -RUN echo '{ "allow_root": true }' > /root/.bowerrc - -RUN npm install -g grunt-cli -RUN apt-get -y install wget -RUN wget -q -O /usr/bin/lein https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein && chmod +x /usr/bin/lein && lein +RUN apt-get -y update \ + && apt-get -y install openjdk-7-jdk --no-install-recommends \ + && npm install bower -g \ + && echo '{ "allow_root": true }' > /root/.bowerrc \ + && npm install -g grunt-cli \ + && apt-get -y install wget --no-install-recommends \ + && wget -q -O /usr/bin/lein https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein && chmod +x /usr/bin/lein && lein \ + && apt-get remove -y wget \ + && cd $(npm root -g)/npm \ + && npm install fs-extra \ + && sed -i -e s/graceful-fs/fs-extra/ -e s/fs.rename/fs.move/ ./lib/utils/rename.js \ + && apt-get clean \ + && apt-get autoremove -y \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ENV APP_HOME /usr/local/visualreview ENV APP_TEMP_HOME /usr/local/visualreviewTemp @@ -17,43 +21,24 @@ ENV APP_TEMP_HOME /usr/local/visualreviewTemp # RUN mkdir -p ${APP_HOME} # RUN mkdir -p ${APP_TEMP_HOME} - WORKDIR ${APP_TEMP_HOME} # add source ADD . ${APP_TEMP_HOME} -RUN cd $(npm root -g)/npm \ - && npm install fs-extra \ - && sed -i -e s/graceful-fs/fs-extra/ -e s/fs.rename/fs.move/ ./lib/utils/rename.js +RUN LEIN_ROOT=true lein uberjar \ + && rm -fr /root/.cache /root/.lein /root/.m2 /root/.npm /root/.node-gyp \ + && mkdir output \ + && mv target/*-standalone.jar output \ + && rm -fr target -RUN LEIN_ROOT=true lein uberjar WORKDIR ${APP_HOME} -RUN mv ${APP_TEMP_HOME}/target/*-standalone.jar ${APP_HOME} -# COPY target/*-standalone.jar /usr/local/visualreview ||| CONTINUE with warning - -RUN cp ${APP_TEMP_HOME}/config.edn . +RUN mv ${APP_TEMP_HOME}/output/*-standalone.jar ${APP_HOME} \ + && cp ${APP_TEMP_HOME}/config.edn . \ + && rm -fr $APP_TEMP_HOME \ + && mv `ls *-standalone.jar` app-standalone.jar -RUN rm -fr $APP_TEMP_HOME -# WORKDIR $APP_HOME -RUN mv `ls *-standalone.jar` app-standalone.jar - -# RUN mkdir -p $APP_HOME - -# remove openjdk and install openjreheadless -RUN apt-get remove -y openjdk-7-jdk \ - && apt-get -y install openjdk-7-jre-headless - - -# clean -RUN apt-get remove -y wget \ - && apt-get clean \ - && apt-get autoremove -y \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ - && rm -fr /root/.cache /root/.lein /root/.m2 /root/.npm /root/.node-gyp CMD ["java", "-jar", "app-standalone.jar"] - - From 33acd351f4d14ba789e77cee93e484dbd7e9282b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Tue, 14 Jun 2016 10:33:32 +0200 Subject: [PATCH 13/28] fix dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 54f1c22..f2f5089 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ FROM node EXPOSE 7000 RUN apt-get -y update \ + && apt-get -y upgrade \ && apt-get -y install openjdk-7-jdk --no-install-recommends \ && npm install bower -g \ && echo '{ "allow_root": true }' > /root/.bowerrc \ From 99f98b85824e66bdf2ccab802507d3f7e09a3dc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Fri, 17 Jun 2016 14:54:55 +0200 Subject: [PATCH 14/28] node slim --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f2f5089..06c4932 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node +FROM node:slim EXPOSE 7000 RUN apt-get -y update \ && apt-get -y upgrade \ From 804fbd35cbd988b259214518ce7d55966d33eab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Fri, 17 Jun 2016 15:07:24 +0200 Subject: [PATCH 15/28] test --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 06c4932..d5e66b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:slim +FROM node:0.10.45-slim EXPOSE 7000 RUN apt-get -y update \ && apt-get -y upgrade \ From 76baa472d68a7d59c401da5fbc44bdabe01ae4d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Mon, 20 Jun 2016 08:53:39 +0200 Subject: [PATCH 16/28] remove slim --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d5e66b8..06c4932 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:0.10.45-slim +FROM node:slim EXPOSE 7000 RUN apt-get -y update \ && apt-get -y upgrade \ From 3eb0b0f6024346117ebe9e45795fb99e0330fb7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Wed, 22 Jun 2016 11:00:25 +0200 Subject: [PATCH 17/28] test --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 06c4932..f630fae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,5 +41,4 @@ RUN mv ${APP_TEMP_HOME}/output/*-standalone.jar ${APP_HOME} \ && mv `ls *-standalone.jar` app-standalone.jar - CMD ["java", "-jar", "app-standalone.jar"] From 08b03f605c8a34009224b489d680529c8660d14c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Wed, 22 Jun 2016 13:55:15 +0200 Subject: [PATCH 18/28] add dist dockerfile --- Dockerfile.dist | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Dockerfile.dist diff --git a/Dockerfile.dist b/Dockerfile.dist new file mode 100644 index 0000000..a43883a --- /dev/null +++ b/Dockerfile.dist @@ -0,0 +1,8 @@ +FROM anapsix/alpine-java:jdk8 + +EXPOSE 7000 + +RUN mkdir -p /app/vr/ +ADD app-standalone.jar /app/vr/ + +CMD java -jar /app/vr/app-standalone.jar \ No newline at end of file From 58fabfb204bd3985af9c00699f918eab9488cb27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Wed, 22 Jun 2016 14:01:38 +0200 Subject: [PATCH 19/28] update --- Dockerfile.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.dist b/Dockerfile.dist index a43883a..b1dcd2d 100644 --- a/Dockerfile.dist +++ b/Dockerfile.dist @@ -5,4 +5,4 @@ EXPOSE 7000 RUN mkdir -p /app/vr/ ADD app-standalone.jar /app/vr/ -CMD java -jar /app/vr/app-standalone.jar \ No newline at end of file +CMD ["java", "-jar", "/app/vr/app-standalone.jar"] \ No newline at end of file From 1615cbff0ce3343ffa97d443183c9093dc9024ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Thu, 23 Jun 2016 08:41:05 +0200 Subject: [PATCH 20/28] add circleci deploy file --- circle.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..5daad51 --- /dev/null +++ b/circle.yml @@ -0,0 +1,21 @@ +machine: + services: + - docker + +test: + override: + - lein test-all + - lein uberjar + - mkdir DIST + - cp Dockerfile.dist DIST/ + - cp `ls target/*-standalone.jar` DIST/app-standalone.jar + - cp config.edn DIST/ + - cd BUILD + - docker build -t rgroult2/visualreview -f Dockerfile.dist + +deployment: + hub: + branch: develop + commands: + - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS + - docker push rgroult2/visualreview From fa16f810fba8c394eb1bee3833f971c6f8090471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Thu, 23 Jun 2016 08:53:08 +0200 Subject: [PATCH 21/28] update --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 5daad51..5fc227d 100644 --- a/circle.yml +++ b/circle.yml @@ -11,7 +11,7 @@ test: - cp `ls target/*-standalone.jar` DIST/app-standalone.jar - cp config.edn DIST/ - cd BUILD - - docker build -t rgroult2/visualreview -f Dockerfile.dist + - docker build -t rgroult2/visualreview -f Dockerfile.dist . deployment: hub: From bcd2d4d75137ff7caa0f6a72182c9949f6d0eb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Thu, 23 Jun 2016 09:01:01 +0200 Subject: [PATCH 22/28] update --- circle.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 5fc227d..538a379 100644 --- a/circle.yml +++ b/circle.yml @@ -10,8 +10,7 @@ test: - cp Dockerfile.dist DIST/ - cp `ls target/*-standalone.jar` DIST/app-standalone.jar - cp config.edn DIST/ - - cd BUILD - - docker build -t rgroult2/visualreview -f Dockerfile.dist . + - docker build -t rgroult2/visualreview -f Dockerfile.dist BUILD deployment: hub: From 031a04d621521c7bf8cc4368fb3e846cce0b7cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Thu, 23 Jun 2016 09:19:30 +0200 Subject: [PATCH 23/28] upadte --- Dockerfile.dist | 1 + circle.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.dist b/Dockerfile.dist index b1dcd2d..2f63386 100644 --- a/Dockerfile.dist +++ b/Dockerfile.dist @@ -4,5 +4,6 @@ EXPOSE 7000 RUN mkdir -p /app/vr/ ADD app-standalone.jar /app/vr/ +ADD config.edn /app/vr/ CMD ["java", "-jar", "/app/vr/app-standalone.jar"] \ No newline at end of file diff --git a/circle.yml b/circle.yml index 538a379..caff25e 100644 --- a/circle.yml +++ b/circle.yml @@ -10,7 +10,7 @@ test: - cp Dockerfile.dist DIST/ - cp `ls target/*-standalone.jar` DIST/app-standalone.jar - cp config.edn DIST/ - - docker build -t rgroult2/visualreview -f Dockerfile.dist BUILD + - cd DIST && docker build -t rgroult2/visualreview -f Dockerfile.dist . deployment: hub: From b625355dad1020f0d469c2990bf2b804e77bc22d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Thu, 23 Jun 2016 09:32:55 +0200 Subject: [PATCH 24/28] update --- circle.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/circle.yml b/circle.yml index caff25e..a064533 100644 --- a/circle.yml +++ b/circle.yml @@ -6,15 +6,16 @@ test: override: - lein test-all - lein uberjar - - mkdir DIST - - cp Dockerfile.dist DIST/ - - cp `ls target/*-standalone.jar` DIST/app-standalone.jar - - cp config.edn DIST/ - - cd DIST && docker build -t rgroult2/visualreview -f Dockerfile.dist . - + - cp target/*.jar $CIRCLE_ARTIFACTS + deployment: hub: - branch: develop + branch: dockerfile commands: + - mkdir DIST + - cp Dockerfile.dist DIST/ + - cp `ls target/*-standalone.jar` DIST/app-standalone.jar + - cp config.edn DIST/ + - cd DIST && docker build -t rgroult2/visualreview -f Dockerfile.dist . - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS - docker push rgroult2/visualreview From 3383665c9078320e487aaf197df964863071fdb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Thu, 23 Jun 2016 09:51:58 +0200 Subject: [PATCH 25/28] update --- Dockerfile.dist | 10 +++++++--- circle.yml | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile.dist b/Dockerfile.dist index 2f63386..bf1ce12 100644 --- a/Dockerfile.dist +++ b/Dockerfile.dist @@ -2,8 +2,12 @@ FROM anapsix/alpine-java:jdk8 EXPOSE 7000 -RUN mkdir -p /app/vr/ -ADD app-standalone.jar /app/vr/ -ADD config.edn /app/vr/ +ENV APP_HOME /app/vr/ + +RUN mkdir -p ${APP_HOME} +ADD app-standalone.jar /${APP_HOME} +ADD config.edn ${APP_HOME} + +WORKDIR ${APP_HOME} CMD ["java", "-jar", "/app/vr/app-standalone.jar"] \ No newline at end of file diff --git a/circle.yml b/circle.yml index a064533..424368a 100644 --- a/circle.yml +++ b/circle.yml @@ -7,7 +7,7 @@ test: - lein test-all - lein uberjar - cp target/*.jar $CIRCLE_ARTIFACTS - + deployment: hub: branch: dockerfile From 40c6806befc58938eea87e60914c3153effefa2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Thu, 23 Jun 2016 15:47:09 +0200 Subject: [PATCH 26/28] update version change data on docker image --- Dockerfile.dist | 4 ++++ circle.yml | 2 +- config.edn.Dist | 13 +++++++++++++ project.clj | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 config.edn.Dist diff --git a/Dockerfile.dist b/Dockerfile.dist index bf1ce12..67f8486 100644 --- a/Dockerfile.dist +++ b/Dockerfile.dist @@ -3,11 +3,15 @@ FROM anapsix/alpine-java:jdk8 EXPOSE 7000 ENV APP_HOME /app/vr/ +ENV APP_DATA /opt/data/visualreview/ RUN mkdir -p ${APP_HOME} +RUN mkdir -p ${APP_DATA} + ADD app-standalone.jar /${APP_HOME} ADD config.edn ${APP_HOME} WORKDIR ${APP_HOME} +VOLUME [${APP_DATA}] CMD ["java", "-jar", "/app/vr/app-standalone.jar"] \ No newline at end of file diff --git a/circle.yml b/circle.yml index 424368a..71b6fb3 100644 --- a/circle.yml +++ b/circle.yml @@ -15,7 +15,7 @@ deployment: - mkdir DIST - cp Dockerfile.dist DIST/ - cp `ls target/*-standalone.jar` DIST/app-standalone.jar - - cp config.edn DIST/ + - cp config.edn.Dist DIST/config.edn - cd DIST && docker build -t rgroult2/visualreview -f Dockerfile.dist . - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS - docker push rgroult2/visualreview diff --git a/config.edn.Dist b/config.edn.Dist new file mode 100644 index 0000000..dd8ebc8 --- /dev/null +++ b/config.edn.Dist @@ -0,0 +1,13 @@ +{ + ;; Server + :server-port "7000" + + ;; Database + :db-uri "file:/opt/data/visualreview/visualreview.db" + :db-user "" + :db-password "" + + ;; File system + :screenshots-dir "/opt/data/visualreview/screenshots" + + } diff --git a/project.clj b/project.clj index db147ec..381bfe1 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject visualreview "0.1.4-SNAPSHOT" +(defproject visualreview "0.1.4-OL-SNAPSHOT" :description "Provides a productive and human-friendly workflow for catching visual regressions by comparing screenshots" :url "https://github.com/xebia/VisualReview" :license {:name "Apache Licence 2.0" From 99ce97f8b5aa3193310e6b10cbb9ef1dfa53b0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Thu, 23 Jun 2016 15:53:21 +0200 Subject: [PATCH 27/28] revert to working dev dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f630fae..f2f5089 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:slim +FROM node EXPOSE 7000 RUN apt-get -y update \ && apt-get -y upgrade \ @@ -41,4 +41,5 @@ RUN mv ${APP_TEMP_HOME}/output/*-standalone.jar ${APP_HOME} \ && mv `ls *-standalone.jar` app-standalone.jar + CMD ["java", "-jar", "app-standalone.jar"] From 7ecfcdd34e7a9d6a9851493bc20292edba219e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Groult?= Date: Fri, 5 Aug 2016 13:03:59 +0200 Subject: [PATCH 28/28] reset values to xebia's --- circle.yml | 4 ++-- project.clj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 71b6fb3..de01b6a 100644 --- a/circle.yml +++ b/circle.yml @@ -16,6 +16,6 @@ deployment: - cp Dockerfile.dist DIST/ - cp `ls target/*-standalone.jar` DIST/app-standalone.jar - cp config.edn.Dist DIST/config.edn - - cd DIST && docker build -t rgroult2/visualreview -f Dockerfile.dist . + - cd DIST && docker build -t xebia/visualreview -f Dockerfile.dist . - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS - - docker push rgroult2/visualreview + - docker push xebia/visualreview diff --git a/project.clj b/project.clj index 381bfe1..db147ec 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject visualreview "0.1.4-OL-SNAPSHOT" +(defproject visualreview "0.1.4-SNAPSHOT" :description "Provides a productive and human-friendly workflow for catching visual regressions by comparing screenshots" :url "https://github.com/xebia/VisualReview" :license {:name "Apache Licence 2.0"