Compare commits

...

10 Commits

Author SHA1 Message Date
1007880f8c 4.3.9 2017-03-11 14:29:37 +01:00
4ec2503671 update 2017-03-11 14:29:10 +01:00
b1814a60d5 4.3.8 2017-02-25 03:12:07 +01:00
aed0fee59f add mongo image 2017-02-25 02:10:23 +01:00
fc53a7e3f0 fix tests 2017-02-19 14:52:54 +01:00
6ee919ac34 4.3.7 2017-02-19 14:51:37 +01:00
1b8680edff update test 2017-02-18 23:51:09 +01:00
67f4456073 update tests 2017-02-18 23:32:59 +01:00
b2835bd220 improve tests 2017-02-18 23:01:07 +01:00
a0a2cc2eda update tests 2017-02-18 22:28:05 +01:00
12 changed files with 33 additions and 28 deletions

View File

@ -27,9 +27,6 @@ test:
stage: test stage: test
script: script:
- npmci test docker - npmci test docker
only:
- tags
- triggers
tags: tags:
- lossless - lossless
- priv - priv

View File

@ -1,7 +1,7 @@
FROM ubuntu:latest FROM ubuntu:latest
# important environment variables # important environment variables
ENV NODE_VERSION_LTS="6.9.1" NODE_VERSION_STABLE="7.1.0" NVM_DIR="/usr/local/nvm" ENV NODE_VERSION_LTS="6.10.0" NODE_VERSION_STABLE="7.7.2" NVM_DIR="/usr/local/nvm"
# Set debconf to run non-interactively and install packages # Set debconf to run non-interactively and install packages
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections \ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections \
@ -26,12 +26,4 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
&& rm -r /var/lib/apt/lists/* && rm -r /var/lib/apt/lists/*
# Install nvm with node and npm # Install nvm with node and npm
RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.31.0/install.sh | bash \ RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.31.0/install.sh | bash
&& bash -c "source $NVM_DIR/nvm.sh \
&& nvm install $NODE_VERSION_STABLE \
&& nvm alias default $NODE_VERSION_STABLE \
&& nvm use default \
&& npm install -g npm"
ENV NODE_PATH $NVM_DIR/v$NODE_VERSION_STABLE/lib/node_modules
ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION_STABLE/bin:$PATH

5
Dockerfile_mongo Normal file
View File

@ -0,0 +1,5 @@
FROM hosttoday/ht-docker-node:stable
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927 \
&& echo "deb http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.2.list \
&& apt-get update \
&& apt-get install -y mongodb-org

View File

@ -1,2 +1,2 @@
FROM hosttoday/ht-docker-node:latest FROM hosttoday/ht-docker-node:stable
RUN npm install -g npmci RUN npm install -g npmci

View File

@ -1,2 +0,0 @@
FROM hosttoday/ht-docker-node:npmci
RUN npm install -g npmdeploy

View File

@ -1,5 +0,0 @@
FROM hosttoday/ht-docker-node:npmts
RUN npmci install stable && npmci command npm install -g npmpage && npmci command npmpage -v \
&& npmci install legacy && npmci command npm install -g npmpage && npmci command npmpage -v \
&& npmci install lts && npmci command npm install -g npmpage && npmci command npmpage -v \
&& npmci clean

View File

@ -1,5 +0,0 @@
FROM hosttoday/ht-docker-node:npmci
RUN npmci install stable && npmci command npm install -g npm npmts && npmci command npmts -v \
&& npmci install legacy && npmci command npm install -g npm npmts && npmci command npmts -v \
&& npmci install lts && npmci command npm install -g npm npmts && npmci command npmts -v \
&& npmci clean

View File

@ -1 +1,10 @@
FROM hosttoday/ht-docker-node:latest FROM hosttoday/ht-docker-node:latest
RUN bash -c "source $NVM_DIR/nvm.sh \
&& nvm install $NODE_VERSION_STABLE \
&& nvm alias default $NODE_VERSION_STABLE \
&& nvm use default \
&& npm install -g npm"
ENV NODE_PATH $NVM_DIR/v$NODE_VERSION_STABLE/lib/node_modules
ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION_STABLE/bin:$PATH

View File

@ -27,4 +27,4 @@ RUN npmci install [node_version_number] // this installs node using node and set
* **:npmci** - npmci preinstalled * **:npmci** - npmci preinstalled
* **:npmts** - npmci + npmts preinstalled * **:npmts** - npmci + npmts preinstalled
* **:npmpage** - npmci + npmts + npmpage preinstalled * **:npmpage** - npmci + npmts + npmpage preinstalled
* **:python3** - like :latest, but with python3 as standard python version * **:mongo** - npmci + npmts + mongo

View File

@ -1,6 +1,6 @@
{ {
"name": "ht-docker-node", "name": "ht-docker-node",
"version": "4.3.6", "version": "4.3.9",
"description": "docker image with nodejs with shipzone.io support", "description": "docker image with nodejs with shipzone.io support",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

View File

@ -1,3 +1,9 @@
#!/bin/sh #!/bin/sh
# test availability of node and npm
npm -v npm -v
node -v node -v
# test yarn
yarn global add npmts
npmts -v

View File

@ -1 +1,9 @@
# check if npmci is available
npmci -v npmci -v
# check if we can use lts
npmci install lts
# check if yarn picks it up
npmci command yarn global add npmts
npmci command npmts -v