Compare commits

...

30 Commits

Author SHA1 Message Date
dfadb7e1f2 4.3.56 2018-04-10 13:45:01 +02:00
1932695c81 add verify step 2018-04-10 13:44:54 +02:00
8f914cbf47 4.3.55 2018-04-09 18:47:33 +02:00
7b390fd1da update ci to put less strain on network 2018-04-09 18:47:28 +02:00
0eb7a24dcd 4.3.54 2018-04-09 17:33:02 +02:00
fe2452111e update 2018-04-09 17:32:52 +02:00
84930b7c3e 4.3.53 2018-01-31 19:27:26 +01:00
cb99fd28d0 remove obsolete 2018-01-31 19:27:07 +01:00
4f557b6a08 slim down the base image 2018-01-31 19:23:52 +01:00
ee1f86e7ab 4.3.52 2018-01-31 00:29:38 +01:00
8a3b598f66 fix(Dockerfile) remove apt lists from layer 2018-01-31 00:29:36 +01:00
4ebce929f8 4.3.51 2017-12-20 23:30:30 +01:00
244ada778b update docker 2017-12-20 23:30:19 +01:00
b85de4bd9b 4.3.50 2017-12-20 17:33:35 +01:00
3762558b58 add puppeteer compatibility 2017-12-20 17:33:28 +01:00
c2bb8b18fd 4.3.49 2017-12-15 17:55:08 +01:00
f147ef9b46 update nvm 2017-12-15 17:55:01 +01:00
4b4e1bedcc 4.3.48 2017-12-15 17:19:02 +01:00
87bb2843f5 update node versions 2017-12-15 17:18:58 +01:00
0f541d3101 4.3.47 2017-10-13 16:44:01 +02:00
7aa6864a74 update images 2017-10-13 16:43:58 +02:00
138e25843d 4.3.46 2017-10-13 16:00:16 +02:00
40d0d6b73e update :npmdocker 2017-10-13 16:00:12 +02:00
9a7949ea87 4.3.45 2017-10-13 15:50:30 +02:00
ef46145028 update :npmci and :npmdocker 2017-10-13 15:50:26 +02:00
0b5ff58b7b 4.3.44 2017-10-11 18:26:46 +02:00
2756a4cf4e 4.3.43 2017-10-11 18:16:16 +02:00
e4dce5cbc1 buildAndTest not for triggers 2017-10-11 18:16:11 +02:00
6b07d92d12 4.3.42 2017-10-11 17:35:32 +02:00
ae04ea4a41 fix npmpage 2017-10-11 17:35:28 +02:00
14 changed files with 51 additions and 53 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
.idea/
node_modules/

View File

@ -2,64 +2,37 @@
image: hosttoday/ht-docker-dbase:npmci
services:
- docker:dind
variables:
DOCKER_DRIVER: overlay
stages:
- buildAndTest
- build
- test
- release
- trigger
- pages
- verify
before_script:
- yarn global add npmci
- npmci docker login
buildAndTest:
buildTest:
stage: buildAndTest
script:
- npmci docker build
- npmci docker test
except:
- tags
- triggers
tags:
- lossless
- priv
build:
stage: build
buildTestRelase:
stage: buildAndTest
script:
- npmci docker build
- npmci docker push registry.gitlab.com test
only:
- tags
- triggers
tags:
- lossless
- priv
test:
stage: test
script:
- npmci docker pull registry.gitlab.com test
- npmci docker test
only:
- tags
- triggers
tags:
- lossless
- priv
release:
stage: release
script:
- npmci docker pull registry.gitlab.com test
- npmci docker push docker.io
- npmci docker push registry.gitlab.com test
- npmci docker push registry.gitlab.com
- npmci docker push docker.io
only:
- tags
- triggers
@ -94,3 +67,12 @@ pages:
expire_in: 1 week
paths:
- public
verify:
stage: trigger
script:
- npmci docker pull registry.gitlab.com test
only:
- tags
tags:
- docker

View File

@ -1,8 +1,8 @@
FROM ubuntu:xenial
MAINTAINER Lossless GmbH <office@lossless.com>
LABEL author="Lossless GmbH <office@lossless.com>"
# important environment variables
ENV NODE_VERSION_LTS="6.10.0" NODE_VERSION_STABLE="8.1.3" NVM_DIR="/usr/local/nvm"
ENV NODE_VERSION_LTS="8.9.4" NODE_VERSION_STABLE="9.4.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 \
@ -31,4 +31,4 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
&& rm -r /var/lib/apt/lists/*
# 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.33.8/install.sh | bash

18
Dockerfile_chrome Normal file
View File

@ -0,0 +1,18 @@
FROM hosttoday/ht-docker-node:stable
# See https://crbug.com/795759
RUN apt-get update && apt-get install -yq libgconf-2-4 \
&& apt-get clean \
&& rm -r /var/lib/apt/lists/*
# Install latest chrome dev package.
# Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer
# installs, work.
RUN apt-get update && apt-get install -y wget --no-install-recommends \
&& wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
&& sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
&& apt-get update \
&& apt-get install -y google-chrome-unstable \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \
&& rm -rf /src/*.deb

View File

@ -1,5 +1,5 @@
FROM hosttoday/ht-docker-node:latest
MAINTAINER Lossless GmbH <office@lossless.com>
LABEL author="Lossless GmbH <office@lossless.com>"
RUN bash -c "source $NVM_DIR/nvm.sh \
&& nvm install $NODE_VERSION_LTS \

View File

@ -1,7 +0,0 @@
FROM hosttoday/ht-docker-node:stable
MAINTAINER Lossless GmbH <office@lossless.com>
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6 \
&& echo "deb [ arch=amd64,arm64 ] http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.4.list \
&& apt-get update \
&& apt-get install -y mongodb-org

View File

@ -1,4 +1,4 @@
FROM hosttoday/ht-docker-node:stable
MAINTAINER Lossless GmbH <office@lossless.com>
LABEL author="Lossless GmbH <office@lossless.com>"
RUN npm install -g npmci
RUN yarn global add npmci

View File

@ -1,5 +1,5 @@
FROM hosttoday/ht-docker-node:npmci
MAINTAINER Lossless GmbH <office@lossless.com>
LABEL author="Lossless GmbH <office@lossless.com>"
# Install Java.
RUN \

4
Dockerfile_npmdocker Normal file
View File

@ -0,0 +1,4 @@
FROM hosttoday/ht-docker-node:stable
LABEL author="Lossless GmbH <office@lossless.com>"
RUN yarn global add npmci npmdocker @gitzone/npmts ts-node

View File

@ -1,6 +1,8 @@
FROM hosttoday/ht-docker-node:stable
LABEL author="Lossless GmbH <office@lossless.com>"
RUN apt-get update && apt-get install -y python-pip
RUN npmci command yarn global add npmpage
RUN yarn global add npmpage
RUN pip install --upgrade pip \
&& pip install mkdocs \
&& mkdocs --version \

View File

@ -1,4 +1,5 @@
FROM hosttoday/ht-docker-node:latest
LABEL author="Lossless GmbH <office@lossless.com>"
RUN bash -c "source $NVM_DIR/nvm.sh \
&& nvm install $NODE_VERSION_STABLE \

View File

@ -31,7 +31,6 @@ RUN npmci install [node_version_number] // this installs node using node and set
* **:stable** - node stable version
* **:npmci** - npmci preinstalled
* **:npmcijava - npmci + java
* **:npmts** - npmci + npmts preinstalled
* **:npmpage** - npmci + npmts + npmpage preinstalled
* **:mongo** - npmci + npmts + mongo

1
node_modules/.yarn-integrity generated vendored
View File

@ -1 +0,0 @@
549854b8a60607db81d4c58008d59f812d744acba026266f380acd942941356a

View File

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