Compare commits

...

69 Commits

Author SHA1 Message Date
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
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
27e5fc58e9 4.3.35 2017-09-14 18:58:51 +02:00
db0ed5024d remove obsolete images 2017-09-14 18:58:41 +02:00
3da93c3cad 4.3.34 2017-09-14 18:15:52 +02:00
66ba2a6641 fix tag npmcidocker 2017-09-14 18:15:48 +02:00
002707729d 4.3.33 2017-09-14 17:46:00 +02:00
4733cb523e update nanobox to include docker 2017-09-14 17:45:52 +02:00
ebc7b3758f 4.3.32 2017-09-14 17:32:42 +02:00
414c51b618 add docker 2017-09-14 17:32:36 +02:00
37681614de 4.3.31 2017-09-13 22:02:18 +02:00
82185516e2 fix ci 2017-09-13 22:02:14 +02:00
48bf7e135d 4.3.30 2017-09-13 21:59:33 +02:00
4b0851c8a1 fix ci 2017-09-13 21:59:30 +02:00
9c48d3e7ec 4.3.29 2017-09-13 21:49:52 +02:00
7945303e9f add nanobox 2017-09-13 21:49:47 +02:00
2d11efdcf9 4.3.28 2017-09-12 20:30:06 +02:00
5100b6b3b1 4.3.27 2017-09-12 20:29:10 +02:00
a8da4d3fd4 add build tools 2017-09-12 20:29:06 +02:00
2fd11c91a0 4.3.26 2017-08-28 03:17:26 +02:00
46a0413e94 update ci 2017-08-28 03:17:22 +02:00
a0c9a52ec7 4.3.25 2017-08-28 02:25:48 +02:00
71d9d06ddd update ci 2017-08-28 02:25:05 +02:00
2e23e31bec 4.3.24 2017-08-28 01:59:50 +02:00
82bb2ccc5b Update .gitlab-ci.yml 2017-08-27 23:43:39 +00:00
a5f93beea5 Update .gitlab-ci.yml 2017-08-27 14:36:48 +00:00
6dd5406573 Update .gitlab-ci.yml 2017-08-26 08:57:50 +00:00
22c8f8dbf8 Update .gitlab-ci.yml 2017-08-26 08:46:39 +00:00
d8b582a18b Update .gitlab-ci.yml 2017-08-25 22:14:26 +00:00
15 changed files with 76 additions and 42 deletions

2
.gitignore vendored
View File

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

View File

@ -2,41 +2,36 @@
image: hosttoday/ht-docker-dbase:npmci image: hosttoday/ht-docker-dbase:npmci
services: services:
- docker:dind - docker:dind
variables:
DOCKER_DRIVER: overlay
stages: stages:
- build - buildAndTest
- test
- release
- trigger - trigger
- pages - pages
before_script: before_script:
- npmci prepare docker - yarn global add npmci
- npmci docker login
build: buildTest:
stage: build stage: buildAndTest
script: script:
- npmci build docker - npmci docker build
tags: - npmci docker test
- lossless except:
- priv - tags
- triggers
test:
stage: test
script:
- npmci test docker
tags: tags:
- lossless - lossless
- priv - priv
release: buildTestRelase:
stage: release stage: buildAndTest
script: script:
- npmci publish docker - npmci docker build
- npmci docker test
- npmci docker push registry.gitlab.com test
- npmci docker push registry.gitlab.com
- npmci docker push docker.io
only: only:
- tags - tags
- triggers - triggers

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.4" NODE_VERSION_STABLE="9.4.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 \
@ -14,11 +14,14 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
build-essential \ build-essential \
ca-certificates \ ca-certificates \
curl \ curl \
g++ \
gcc \
git \ git \
ssh \ make \
openssl \ openssl \
python \ python \
rsync \ rsync \
ssh \
wget \ wget \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && 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 \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
@ -28,4 +31,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.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 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 +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 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,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 @gitzone/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

@ -31,7 +31,6 @@ RUN npmci install [node_version_number] // this installs node using node and set
* **:stable** - node stable version * **:stable** - node stable version
* **:npmci** - npmci preinstalled * **:npmci** - npmci preinstalled
* **:npmcijava - npmci + java * **:npmcijava - npmci + java
* **:npmts** - npmci + npmts preinstalled
* **:npmpage** - npmci + npmts + npmpage preinstalled * **:npmpage** - npmci + npmts + npmpage preinstalled
* **:mongo** - npmci + npmts + mongo * **: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", "name": "ht-docker-node",
"version": "4.3.23", "version": "4.3.55",
"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