Compare commits

...

33 Commits

Author SHA1 Message Date
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
2abed13111 4.3.41 2017-10-11 17:29:46 +02:00
14da195a62 update Dockerfile_npmpage 2017-10-11 17:29:44 +02:00
bbe957a694 update tests 2017-10-11 17:28:32 +02:00
963ca3e5ff update cosmetics 2017-10-11 17:22:55 +02:00
108ec46426 4.3.40 2017-10-11 17:22:21 +02:00
33ebe443bb add npmpage 2017-10-11 17:22:17 +02:00
90b2c7d5f3 4.3.39 2017-10-09 20:55:09 +02:00
d16ad9bf61 update mongo 2017-10-09 20:55:06 +02:00
dd82475256 4.3.38 2017-10-09 20:40:01 +02:00
239bf6174d update base image 2017-10-09 20:39:55 +02:00
0ae1d77cb2 4.3.37 2017-10-09 20:23:24 +02:00
decc90e211 update mongo 2017-10-09 20:23:20 +02:00
ae10a9eb98 4.3.36 2017-10-09 19:17:32 +02:00
ba780fd445 update mongo image 2017-10-09 19:17:28 +02:00
11 changed files with 55 additions and 12 deletions

View File

@ -25,6 +25,7 @@ buildAndTest:
- npmci docker test - npmci docker test
except: except:
- tags - tags
- triggers
tags: tags:
- lossless - lossless
- priv - priv

View File

@ -1,8 +1,8 @@
FROM ubuntu:latest FROM ubuntu:xenial
MAINTAINER Lossless GmbH <office@lossless.com> LABEL author="Lossless GmbH <office@lossless.com>"
# important environment variables # 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.3" NODE_VERSION_STABLE="9.3.0" 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 \
@ -30,5 +30,20 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
&& apt-get clean \ && apt-get clean \
&& rm -r /var/lib/apt/lists/* && rm -r /var/lib/apt/lists/*
# See https://crbug.com/795759
RUN apt-get update && apt-get install -yq libgconf-2-4
# 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
# 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.33.8/install.sh | bash

View File

@ -1,5 +1,5 @@
FROM hosttoday/ht-docker-node:latest 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 \ RUN bash -c "source $NVM_DIR/nvm.sh \
&& nvm install $NODE_VERSION_LTS \ && nvm install $NODE_VERSION_LTS \

View File

@ -1,7 +1,7 @@
FROM hosttoday/ht-docker-node:stable FROM hosttoday/ht-docker-node:stable
MAINTAINER Lossless GmbH <office@lossless.com> LABEL author="Lossless GmbH <office@lossless.com>"
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927 \ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6 \
&& 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 \ && 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 update \
&& apt-get install -y mongodb-org && apt-get install -y mongodb-org

View File

@ -1,4 +1,4 @@
FROM hosttoday/ht-docker-node:stable 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 FROM hosttoday/ht-docker-node:npmci
MAINTAINER Lossless GmbH <office@lossless.com> LABEL author="Lossless GmbH <office@lossless.com>"
# Install Java. # Install Java.
RUN \ 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 npmts ts-node

21
Dockerfile_npmpage Normal file
View File

@ -0,0 +1,21 @@
FROM hosttoday/ht-docker-node:stable
LABEL author="Lossless GmbH <office@lossless.com>"
RUN apt-get update && apt-get install -y python-pip
RUN yarn global add npmpage
RUN pip install --upgrade pip \
&& pip install mkdocs \
&& mkdocs --version \
&& pip install mkdocs-material \
&& pip install pygments \
&& pip install pymdown-extensions
# Set working directory
WORKDIR /docs
# Expose MkDocs development server port
EXPOSE 8000
# Start development server by default
ENTRYPOINT ["mkdocs"]
CMD ["serve", "--dev-addr=0.0.0.0:8000"]

View File

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

View File

@ -1,6 +1,6 @@
{ {
"name": "ht-docker-node", "name": "ht-docker-node",
"version": "4.3.35", "version": "4.3.51",
"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": {

1
test/test_npmpage.sh Normal file
View File

@ -0,0 +1 @@
mkdocs --version