From a285e5d68648eef1968f132a75f6df6444113db8 Mon Sep 17 00:00:00 2001 From: jineetd Date: Mon, 17 Dec 2018 18:03:09 +0530 Subject: [PATCH 1/5] Upgrade Node:2.0 --- executionnode/Dockerfile | 9 ++++----- nodejs/Dockerfile | 13 ++++++------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/executionnode/Dockerfile b/executionnode/Dockerfile index 3d70a43..854458c 100644 --- a/executionnode/Dockerfile +++ b/executionnode/Dockerfile @@ -12,11 +12,10 @@ ENV LANG en_IN.UTF-8 ENV LANGUAGE en_IN ENV LC_ALL en_IN.UTF-8 # verify modified configuration -RUN dpkg-reconfigure --frontend noninteractive locales - -RUN apt-get update && apt-get install -y curl -RUN curl -sL https://deb.nodesource.com/setup_10.x -o nodesource_setup.sh -RUN bash nodesource_setup.sh +RUN dpkg-reconfigure --frontend noninteractive locales && \ + apt-get update && apt-get install -y curl && \ + curl -sL https://deb.nodesource.com/setup_10.x -o nodesource_setup.sh && \ + bash nodesource_setup.sh RUN apt-get update && apt-get install -y software-properties-common && \ apt-add-repository -y ppa:webupd8team/java && apt-get update && \ echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | \ diff --git a/nodejs/Dockerfile b/nodejs/Dockerfile index b8826c8..be8dcc2 100644 --- a/nodejs/Dockerfile +++ b/nodejs/Dockerfile @@ -12,10 +12,9 @@ ENV LANG en_IN.UTF-8 ENV LANGUAGE en_IN ENV LC_ALL en_IN.UTF-8 # verify modified configuration -RUN dpkg-reconfigure --frontend noninteractive locales - -RUN apt-get update && apt-get install -y curl -RUN curl -sL https://deb.nodesource.com/setup_10.x -o nodesource_setup.sh -RUN bash nodesource_setup.sh -RUN apt-get update && apt-get install --force-yes -y nodejs build-essential git -RUN rm nodesource_setup.sh +RUN dpkg-reconfigure --frontend noninteractive locales && \ + apt-get update && apt-get install -y curl && \ + curl -sL https://deb.nodesource.com/setup_10.x -o nodesource_setup.sh && \ + bash nodesource_setup.sh && \ + apt-get update && apt-get install --force-yes -y nodejs build-essential git && \ + rm nodesource_setup.sh From 38f86b0276df3d038a97be98b2ab18e66d66b197 Mon Sep 17 00:00:00 2001 From: jineetd Date: Mon, 31 Dec 2018 19:03:31 +0530 Subject: [PATCH 2/5] add .travis.yml --- .travis.yml | 13 +++++++++++++ tests/test_runner.sh | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 .travis.yml create mode 100644 tests/test_runner.sh diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..f66eee3 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +sudo: required +dist: xenial + +notifications: + email: + recipients: + - kaushikrohit325@gmail.com + - prasad.talasila@eng.au.dk + on_success: change + on_failure: always + +script: +- bash tests/test_runner.sh diff --git a/tests/test_runner.sh b/tests/test_runner.sh new file mode 100644 index 0000000..809a41d --- /dev/null +++ b/tests/test_runner.sh @@ -0,0 +1,2 @@ +sudo docker build nodejs/ +sudo docker build executionnode/ From b38951efebcfb2b2f10f903a2c24572ccc139aea Mon Sep 17 00:00:00 2001 From: jineetd Date: Mon, 31 Dec 2018 19:21:02 +0530 Subject: [PATCH 3/5] add .travis.yml only dev --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index f66eee3..771c1e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ sudo: required dist: xenial +branches: + only: + -dev notifications: email: From 35e6ecc11240188e4f1bdb88c54f6ce1da0b4b18 Mon Sep 17 00:00:00 2001 From: jineetd Date: Thu, 3 Jan 2019 10:59:53 +0530 Subject: [PATCH 4/5] sync dev --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 771c1e6..b0e2b18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ branches: notifications: email: recipients: - - kaushikrohit325@gmail.com - prasad.talasila@eng.au.dk on_success: change on_failure: always From 1791004416be88cb95f9036a977eb4bc9591fd62 Mon Sep 17 00:00:00 2001 From: jineetd Date: Thu, 3 Jan 2019 11:11:58 +0530 Subject: [PATCH 5/5] add travis --- executionnode/Dockerfile | 40 ++++++++++++++++++++++------------------ nodejs/Dockerfile | 26 +++++++++++++------------- 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/executionnode/Dockerfile b/executionnode/Dockerfile index 854458c..8bda583 100644 --- a/executionnode/Dockerfile +++ b/executionnode/Dockerfile @@ -1,25 +1,29 @@ FROM ubuntu:18.04 -RUN apt-get update -# make sure that locales package is available -RUN apt-get install --reinstall -y locales -# uncomment chosen locale to enable it's generation -RUN sed -i 's/# en_IN.UTF-8 UTF-8/en_IN.UTF-8 UTF-8/' /etc/locale.gen -# generate chosen locale -RUN locale-gen en_IN.UTF-8 +# Install UTF-8 locales +RUN apt-get update && \ + apt-get install --reinstall -y locales && \ + sed -i 's/# en_IN.UTF-8 UTF-8/en_IN.UTF-8 UTF-8/' /etc/locale.gen && \ + locale-gen en_IN.UTF-8 # set system-wide locale settings ENV LANG en_IN.UTF-8 ENV LANGUAGE en_IN ENV LC_ALL en_IN.UTF-8 -# verify modified configuration + +# Install NodeJS 10.x RUN dpkg-reconfigure --frontend noninteractive locales && \ - apt-get update && apt-get install -y curl && \ - curl -sL https://deb.nodesource.com/setup_10.x -o nodesource_setup.sh && \ - bash nodesource_setup.sh -RUN apt-get update && apt-get install -y software-properties-common && \ - apt-add-repository -y ppa:webupd8team/java && apt-get update && \ - echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | \ - debconf-set-selections && apt-get install -y --force-yes oracle-java8-installer \ - nodejs build-essential git && add-apt-repository -y ppa:ubuntu-toolchain-r/test && \ - apt-get update && apt-get install -y gcc-6 g++-6 -RUN rm nodesource_setup.sh + apt-get update && \ + apt-get install -y curl gnupg && \ + curl -sL https://deb.nodesource.com/setup_10.x -o nodesource_setup.sh && \ + bash nodesource_setup.sh && \ + apt-get update && apt-get install --force-yes -y nodejs build-essential git && \ + rm nodesource_setup.sh + +RUN apt-get install -y software-properties-common && \ + apt-add-repository -y ppa:webupd8team/java && \ + add-apt-repository -y ppa:ubuntu-toolchain-r/test && \ + apt-get update && \ + echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | \ + debconf-set-selections && \ + apt-get install -y --force-yes oracle-java8-installer && \ +apt-get install -y gcc-6 g++-6 diff --git a/nodejs/Dockerfile b/nodejs/Dockerfile index be8dcc2..32f8fdd 100644 --- a/nodejs/Dockerfile +++ b/nodejs/Dockerfile @@ -1,20 +1,20 @@ FROM ubuntu:18.04 -RUN apt-get update -# make sure that locales package is available -RUN apt-get install --reinstall -y locales -# uncomment chosen locale to enable it's generation -RUN sed -i 's/# en_IN.UTF-8 UTF-8/en_IN.UTF-8 UTF-8/' /etc/locale.gen -# generate chosen locale -RUN locale-gen en_IN.UTF-8 +# Install UTF-8 locales +RUN apt-get update && \ + apt-get install --reinstall -y locales && \ + sed -i 's/# en_IN.UTF-8 UTF-8/en_IN.UTF-8 UTF-8/' /etc/locale.gen && \ + locale-gen en_IN.UTF-8 # set system-wide locale settings ENV LANG en_IN.UTF-8 ENV LANGUAGE en_IN ENV LC_ALL en_IN.UTF-8 -# verify modified configuration + +# Install NodeJS 10.x RUN dpkg-reconfigure --frontend noninteractive locales && \ - apt-get update && apt-get install -y curl && \ - curl -sL https://deb.nodesource.com/setup_10.x -o nodesource_setup.sh && \ - bash nodesource_setup.sh && \ - apt-get update && apt-get install --force-yes -y nodejs build-essential git && \ - rm nodesource_setup.sh + apt-get update && \ + apt-get install -y curl gnupg && \ + curl -sL https://deb.nodesource.com/setup_10.x -o nodesource_setup.sh && \ + bash nodesource_setup.sh && \ + apt-get update && apt-get install --force-yes -y nodejs build-essential git && \ +rm nodesource_setup.sh