Compare commits

...

18 Commits

Author SHA1 Message Date
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
e8c24d504c 4.3.6 2017-02-18 21:11:15 +01:00
866346a0a5 fix 2017-02-18 18:39:14 +01:00
04ea46f681 fix yarn install 2017-02-18 18:34:45 +01:00
cd858ae9fa fix curl 2017-02-18 18:29:27 +01:00
dc28ada99a add yarn 2017-02-18 18:26:19 +01:00
09c78e9577 update to latest node versions for base image 2016-11-18 00:54:35 +01:00
7525d1af5c 4.3.5 2016-08-31 12:48:35 +02:00
043651bfac removed python3 version 2016-08-31 12:47:57 +02:00
621fff81c3 4.3.4 2016-08-31 12:40:17 +02:00
b0e8ff164f added triggers to valid release criteria 2016-08-31 12:40:13 +02:00
8 changed files with 29 additions and 19 deletions

View File

@ -1,4 +1,4 @@
image: hosttoday/ht-docker-dbase
image: hosttoday/ht-docker-dbase:latest
services:
- docker:dind
@ -27,8 +27,6 @@ test:
stage: test
script:
- npmci test docker
only:
- tags
tags:
- lossless
- priv
@ -39,6 +37,7 @@ release:
- npmci publish docker
only:
- tags
- triggers
tags:
- lossless
- priv
@ -49,6 +48,7 @@ trigger:
- npmci trigger
only:
- tags
- triggers
tags:
- lossless
- priv

View File

@ -1,7 +1,7 @@
FROM ubuntu:latest
# important environment variables
ENV NODE_VERSION_LTS="4.4.7" NODE_VERSION_STABLE="6.3.0" NVM_DIR="/usr/local/nvm"
ENV NODE_VERSION_LTS="6.9.1" NODE_VERSION_STABLE="7.1.0" NVM_DIR="/usr/local/nvm"
# Set debconf to run non-interactively and install packages
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections \
@ -18,6 +18,10 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
openssl \
python \
rsync \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
&& apt-get update \
&& apt-get install yarn -y \
&& apt-get clean \
&& rm -r /var/lib/apt/lists/*

5
Dockerfile_mongo Normal file
View File

@ -0,0 +1,5 @@
FROM hosttoday/ht-docker-node:npmts
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,13 +0,0 @@
FROM hosttoday/ht-docker-node:latest
RUN apt-get update \
&& apt-get install -y -q --no-install-recommends \
python3 \
&& apt-get clean \
&& rm -r /var/lib/apt/lists/*
# Install pip and symlink python to python3
RUN curl -O https://bootstrap.pypa.io/get-pip.py \
&& python3 get-pip.py \
&& rm get-pip.py \
&& rm -r /usr/bin/python \
&& ln -s /usr/bin/python3 /usr/bin/python

View File

@ -27,4 +27,4 @@ RUN npmci install [node_version_number] // this installs node using node and set
* **:npmci** - npmci preinstalled
* **:npmts** - npmci + npmts 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",
"version": "4.3.3",
"version": "4.3.8",
"description": "docker image with nodejs with shipzone.io support",
"main": "index.js",
"scripts": {

View File

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

View File

@ -1 +1,9 @@
# check if npmci is available
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