Compare commits

...

147 Commits

Author SHA1 Message Date
a7d2b34f8b 5.0.7 2018-11-29 11:06:53 +01:00
1089942cc3 fix(core): update 2018-11-29 11:06:53 +01:00
f443d220c6 5.0.6 2018-11-29 10:57:30 +01:00
52866e8aa5 fix(tests): remove npmts from tests 2018-11-29 10:57:30 +01:00
50cb638732 5.0.5 2018-11-29 10:49:50 +01:00
67470d22f4 fix(core): update 2018-11-29 10:49:50 +01:00
5a3f5a1a72 5.0.4 2018-11-29 08:03:22 +01:00
3cdcc3738b fix(core): update 2018-11-29 08:03:21 +01:00
d2c8e2b51e 5.0.3 2018-11-28 23:31:14 +01:00
b69c781c4d fix(core): update 2018-11-28 23:31:14 +01:00
7bc8cb3f51 5.0.2 2018-11-28 22:37:04 +01:00
1ce4382885 fix(core): update 2018-11-28 22:37:03 +01:00
e9ff80ceae 5.0.1 2018-11-26 20:36:04 +01:00
32ceafbd59 fix(node versions): update 2018-11-26 20:36:03 +01:00
1acbe775fc 5.0.0 2018-07-16 00:16:12 +02:00
98f9724739 4.3.69 2018-07-16 00:15:36 +02:00
a93ee5a185 4.3.68 2018-07-02 23:02:51 +02:00
90bae2fce4 fix(core): update node versions 2018-07-02 23:02:51 +02:00
ae30ceec26 4.3.67 2018-05-27 13:33:19 +02:00
f1426931fa fix(tests): fis test that did not make sense 2018-05-27 13:33:19 +02:00
097a741488 4.3.66 2018-05-27 13:21:50 +02:00
9d62eab807 fix(dependencies): update to scoped versions of npmci and npmdocker 2018-05-27 13:21:49 +02:00
baeb46ed81 4.3.65 2018-05-27 13:18:51 +02:00
ddd4970762 remove yarn 2018-05-27 13:18:17 +02:00
04659b9344 4.3.64 2018-05-16 18:05:56 +02:00
0ad9c4fcd3 fix(core): add default workspace directory 2018-05-16 18:05:55 +02:00
43063e3507 4.3.63 2018-05-16 01:37:59 +02:00
02ea32961b fix(core): cleanup 2018-05-16 01:37:59 +02:00
c5365798b6 4.3.62 2018-05-16 01:31:41 +02:00
184e13b91e fix(:chrome): update 2018-05-16 01:31:40 +02:00
a1f5bbb6f0 4.3.61 2018-05-16 01:08:52 +02:00
21189adb66 fix(:chrome): fix 2018-05-16 01:08:52 +02:00
4bd28a3a54 4.3.60 2018-05-16 01:00:22 +02:00
b48aa0e077 fix(:chrome): docker tag :chrome is now working with sandboxing 2018-05-16 01:00:21 +02:00
95f4b0b8e4 4.3.59 2018-04-29 17:17:44 +02:00
bb1db7e9a8 remove npmpage 2018-04-29 17:17:40 +02:00
12a9413444 4.3.58 2018-04-29 17:05:05 +02:00
69d937edb0 update to latest standards 2018-04-29 17:04:56 +02:00
4953e7b345 4.3.57 2018-04-10 13:47:24 +02:00
c04e941274 update ci 2018-04-10 13:47:18 +02:00
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
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
d7fbededbd 4.3.23 2017-06-30 20:11:04 +02:00
afb3bba4ac update docs 2017-06-30 20:11:01 +02:00
20eac2bb4a 4.3.22 2017-06-30 19:35:59 +02:00
92e3f97efe update java 2017-06-30 19:23:26 +02:00
87081d5bb6 update 2017-06-30 19:12:55 +02:00
979f8fcd27 add wget 2017-06-30 17:13:37 +02:00
f827d8c36b fix permissions 2017-06-30 17:03:29 +02:00
020bca3347 add unsafe-perm support 2017-06-30 16:58:56 +02:00
e295440d11 4.3.21 2017-06-30 16:42:40 +02:00
a3b5bbc4d4 4.3.20 2017-06-30 16:42:27 +02:00
da26dc649d update 2017-06-30 16:42:20 +02:00
dc7b11c78d 4.3.19 2017-06-30 16:39:12 +02:00
c9b317372f update 2017-06-30 16:38:53 +02:00
c7bdbd3901 update ci 2017-06-30 16:22:53 +02:00
e07d31c2af 4.3.18 2017-06-30 16:19:48 +02:00
8ad139ba56 update maintainer 2017-06-30 16:18:55 +02:00
e7170565f4 Merge branch 'master' of gitlab.com:hosttoday/ht-docker-node 2017-06-30 16:18:25 +02:00
5e89b9a9a7 add java version 2017-06-30 16:18:17 +02:00
5cbf1489bd Update .gitlab-ci.yml 2017-05-15 16:39:32 +00:00
a83cc999c4 4.3.17 2017-04-02 23:45:38 +02:00
ada45c2db7 fix readme name 2017-04-02 23:45:20 +02:00
db439e3733 prefix 2017-04-02 23:45:07 +02:00
16ba6ab3d3 4.3.16 2017-04-02 23:00:14 +02:00
00631f769b fic ci 2017-04-02 23:00:10 +02:00
d110ef6a47 4.3.15 2017-04-02 22:59:03 +02:00
3d1161a799 fix ci pages 2017-04-02 22:59:00 +02:00
6e8f7ef602 4.3.14 2017-04-02 22:13:56 +02:00
b7ba47db18 update readme 2017-04-02 22:13:52 +02:00
d0d3e15922 4.3.13 2017-04-02 22:05:46 +02:00
9a845b8ec7 update ci with pages 2017-04-02 22:02:16 +02:00
75cc86d69f 4.3.12 2017-03-11 14:53:43 +01:00
9f872eb376 fix tests 2017-03-11 14:53:41 +01:00
15165235fd 4.3.11 2017-03-11 14:43:37 +01:00
9e23bf4811 fix tests 2017-03-11 14:43:34 +01:00
6bf5730895 4.3.10 2017-03-11 14:32:41 +01:00
0c733d3a90 update tests 2017-03-11 14:30:48 +01:00
17 changed files with 132 additions and 64 deletions

2
.gitignore vendored
View File

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

View File

@ -1,40 +1,36 @@
image: hosttoday/ht-docker-dbase:latest # gitzone docker
image: hosttoday/ht-docker-dbase:npmci
services: services:
- docker:dind - docker:dind
stages: stages:
- build - buildAndTest
- test - triggerPagesVerify
- release
- trigger
before_script: before_script:
- npm uninstall -g npmci - npm install -g @shipzone/npmci
- npm install -g npmci - npmci docker login
- npmci prepare docker
buildTest:
build: stage: buildAndTest
stage: build
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
@ -43,7 +39,7 @@ release:
- priv - priv
trigger: trigger:
stage: trigger stage: triggerPagesVerify
script: script:
- npmci trigger - npmci trigger
only: only:
@ -52,3 +48,30 @@ trigger:
tags: tags:
- lossless - lossless
- priv - priv
pages:
stage: triggerPagesVerify
before_script:
- 'npmci -v'
image: hosttoday/ht-docker-node:npmci
script:
# - npmci command npm install -g npmpage
# - npmci command npmpage
- echo "nothing here yet until @gitzone/npmpage is ready!"
only:
- tags
tags:
- docker
artifacts:
expire_in: 1 week
paths:
- public
verify:
stage: triggerPagesVerify
script:
- npmci docker pull registry.gitlab.com test
only:
- tags
tags:
- docker

View File

@ -1,7 +1,9 @@
FROM ubuntu:latest FROM ubuntu:xenial
LABEL author="Lossless GmbH <hello@lossless.com>"
WORKDIR /workspace
# important environment variables # important environment variables
ENV NODE_VERSION_LTS="6.10.0" NODE_VERSION_STABLE="7.7.2" NVM_DIR="/usr/local/nvm" ENV NODE_VERSION_LTS="10.13.0" NODE_VERSION_STABLE="11.2.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 \
@ -13,17 +15,18 @@ 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 \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ ssh \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ wget \
&& apt-get update \ && apt-get update \
&& apt-get install yarn -y \
&& apt-get clean \ && apt-get clean \
&& 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

3
Dockerfile_alpine Normal file
View File

@ -0,0 +1,3 @@
FROM node:11.3.0-alpine
LABEL author="Lossless GmbH <hello@lossless.com>"
RUN apk update && apk add bash libc6-compat

19
Dockerfile_chrome Normal file
View File

@ -0,0 +1,19 @@
FROM hosttoday/ht-docker-node:stable
LABEL author="Lossless GmbH <hello@lossless.com>"
# 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,9 +1,11 @@
FROM hosttoday/ht-docker-node:latest FROM hosttoday/ht-docker-node:latest
LABEL author="Lossless GmbH <hello@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 \
&& nvm alias default $NODE_VERSION_LTS \ && nvm alias default $NODE_VERSION_LTS \
&& nvm use default \ && nvm use default \
&& npm config set unsafe-perm true \
&& npm install -g npm" && npm install -g npm"
ENV NODE_PATH $NVM_DIR/v$NODE_VERSION_LTS/lib/node_modules ENV NODE_PATH $NVM_DIR/v$NODE_VERSION_LTS/lib/node_modules

View File

@ -1,5 +0,0 @@
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,4 @@
FROM hosttoday/ht-docker-node:stable FROM hosttoday/ht-docker-node:stable
RUN npm install -g npmci LABEL author="Lossless GmbH <hello@lossless.com>"
RUN npm install -g @shipzone/npmci

14
Dockerfile_npmcijava Normal file
View File

@ -0,0 +1,14 @@
FROM hosttoday/ht-docker-node:npmci
LABEL author="Lossless GmbH <hello@lossless.com>"
# Install Java.
RUN \
echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
add-apt-repository -y ppa:webupd8team/java && \
apt-get update && \
apt-get install -y oracle-java8-installer && \
rm -rf /var/lib/apt/lists/* && \
rm -rf /var/cache/oracle-jdk8-installer
# Define commonly used JAVA_HOME variable
ENV JAVA_HOME /usr/lib/jvm/java-8-oracle

4
Dockerfile_npmdocker Normal file
View File

@ -0,0 +1,4 @@
FROM hosttoday/ht-docker-node:stable
LABEL author="Lossless GmbH <hello@lossless.com>"
RUN npm install -g @shipzone/npmci @gitzone/npmdocker @gitzone/npmts ts-node

View File

@ -1,9 +1,11 @@
FROM hosttoday/ht-docker-node:latest FROM hosttoday/ht-docker-node:latest
LABEL author="Lossless GmbH <hello@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 \
&& nvm alias default $NODE_VERSION_STABLE \ && nvm alias default $NODE_VERSION_STABLE \
&& nvm use default \ && nvm use default \
&& npm config set unsafe-perm true \
&& npm install -g npm" && npm install -g npm"
ENV NODE_PATH $NVM_DIR/v$NODE_VERSION_STABLE/lib/node_modules ENV NODE_PATH $NVM_DIR/v$NODE_VERSION_STABLE/lib/node_modules

View File

@ -1,6 +1,6 @@
{ {
"name": "ht-docker-node", "name": "ht-docker-node",
"version": "4.3.9", "version": "5.0.7",
"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,14 +1,17 @@
# ht-docker-node # ht-docker-node
the ultimate docker node image
This image is available on DockerHub. Specify it as base image like so:
```Dockerfile
FROM hosttoday/ht-docker-node
```
## Status ## Status
[![build status](https://gitlab.com/hosttoday/ht-docker-node/badges/master/build.svg)](https://gitlab.com/hosttoday/ht-docker-node/commits/master) [![build status](https://gitlab.com/hosttoday/ht-docker-node/badges/master/build.svg)](https://gitlab.com/hosttoday/ht-docker-node/commits/master)
[Docs](https://hosttoday.gitlab.io/ht-docker-node/)
## Availability
Registry | Image Path
--- | ---
GitLab Registry | registry.gitlab.com/hosttoday/ht-docker-node
Docker Hub | hosttoday/ht-docker-node
## Usage ## Usage
The purpose of this Docker image is to provide a robust base for node apps and CI. The purpose of this Docker image is to provide a robust base for node apps and CI.
It comes in different flavours and all of them have node, npm, git and ssh in PATH. It comes in different flavours and all of them have node, npm, git and ssh in PATH.
@ -28,3 +31,10 @@ RUN npmci install [node_version_number] // this installs node using node and set
* **:npmts** - npmci + npmts preinstalled * **:npmts** - npmci + npmts preinstalled
* **:npmpage** - npmci + npmts + npmpage preinstalled * **:npmpage** - npmci + npmts + npmpage preinstalled
* **:mongo** - npmci + npmts + mongo * **:mongo** - npmci + npmts + mongo
For further information read the linked docs at the top of this README.
> MIT licensed | **&copy;** [Lossless GmbH](https://lossless.gmbh)
| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
[![repo-footer](https://hosttoday.gitlab.io/assets/repo-footer.svg)](https://host.today)

View File

@ -1,9 +1 @@
#!/bin/sh echo "this runs within latest container!";
# test availability of node and npm
npm -v
node -v
# test yarn
yarn global add npmts
npmts -v

View File

@ -4,6 +4,6 @@ npmci -v
# check if we can use lts # check if we can use lts
npmci install lts npmci install lts
# check if yarn picks it up # check if npm picks it up
npmci command yarn global add npmts npmci command npm install -g @gitzone/gitzone
npmci command npmts -v npmci command gitzone -v

View File

@ -1,6 +0,0 @@
npmci install stable
npmci command npmts -v
npmci install lts
npmci command npmts -v
npmci install legacy
npmci command npmts -v

5
test/test_stable.sh Normal file
View File

@ -0,0 +1,5 @@
# npm
npm -v
node -v
npm install -g @gitzone/gitzone
gitzone -v