Compare commits

..

33 Commits

Author SHA1 Message Date
9e1d21931e 5.0.26 2019-06-19 11:15:19 +02:00
81ef1f1fd9 fix(core): update 2019-06-19 11:15:19 +02:00
9fa5bee1ee 5.0.25 2019-06-19 11:04:44 +02:00
36099654b4 fix(core): update 2019-06-19 11:04:44 +02:00
99bb05ee51 5.0.24 2019-06-18 17:26:52 +02:00
a020d12a2e fix(core): update 2019-06-18 17:26:51 +02:00
f393560c78 5.0.23 2019-06-18 17:25:34 +02:00
258de44568 fix(core): update 2019-06-18 17:25:34 +02:00
02b846642e 5.0.22 2019-06-10 11:37:24 +02:00
7f05f5da84 fix(core): update 2019-06-10 11:37:24 +02:00
a818bf8aeb 5.0.21 2019-06-10 11:35:56 +02:00
d182b93d65 fix(core): update 2019-06-10 11:35:56 +02:00
875da4bc76 5.0.20 2019-06-10 11:31:48 +02:00
3b2729f9bf fix(core): update 2019-06-10 11:31:47 +02:00
d309093c77 5.0.19 2019-06-10 11:05:43 +02:00
78544b9c7a fix(core): update 2019-06-10 11:05:42 +02:00
0b80f1b2ac 5.0.18 2019-06-10 10:58:01 +02:00
094fa46f80 fix(core): update 2019-06-10 10:58:01 +02:00
7c8e796611 5.0.17 2019-06-10 10:56:41 +02:00
30188f8aeb 5.0.16 2019-06-10 10:51:20 +02:00
f829160720 fix(core): update 2019-06-10 10:51:19 +02:00
755ddd2d77 5.0.15 2019-06-10 10:43:23 +02:00
9fbcb625d3 fix(core): update 2019-06-10 10:43:22 +02:00
5ef828500b 5.0.14 2019-06-08 21:36:23 +02:00
a763bc61a0 fix(core): update 2019-06-08 21:36:23 +02:00
860d5c722e 5.0.13 2019-06-03 13:15:48 +02:00
b370777bd4 fix(core): update 2019-06-03 13:15:48 +02:00
4f280ebd13 5.0.12 2019-05-29 20:04:06 +02:00
4e10028f65 fix(core): update 2019-05-29 20:04:06 +02:00
bb44e89699 5.0.11 2019-05-08 23:17:11 +02:00
2ad5215865 fix(core): update 2019-05-08 23:17:11 +02:00
e60bf4dae8 5.0.10 2019-05-08 22:27:59 +02:00
d44f8d7959 fix(core): update 2019-05-08 22:27:59 +02:00
14 changed files with 206 additions and 125 deletions

21
.gitignore vendored
View File

@ -1 +1,22 @@
.nogit/
# artifacts
coverage/
public/
pages/
# installs
node_modules/ node_modules/
# caches
.yarn/
.cache/
.rpt2_cache
# builds
dist/
dist_web/
dist_serve/
dist_ts_web/
# custom

View File

@ -1,77 +1,53 @@
# gitzone docker # gitzone ci_docker
image: hosttoday/ht-docker-dbase:npmci image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
services:
- docker:dind
stages: cache:
- buildAndTest paths:
- triggerPagesVerify - .npmci-cache/
key: "$CI_BUILD_STAGE"
before_script: before_script:
- npm install -g @shipzone/npmci - npm install -g @shipzone/npmci
- npmci npm prepare
stages:
- test
- release
- trigger
- pages
testSTABLE:
stage: test
script:
- npmci node install stable
- npmci npm install
- npmci npm test
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- docker
release:
image: hosttoday/ht-docker-dbase:npmci
services:
- docker:dind
stage: release
script:
- npmci node install stable
- npmci docker login - npmci docker login
- npmci docker build
buildTest: - npmci docker test
stage: buildAndTest - npmci docker push
script:
- npmci docker build
- npmci docker test
except:
- tags
- triggers
tags:
- lossless
- priv
buildTestRelease:
stage: buildAndTest
script:
- 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
tags: tags:
- lossless - docker
- priv - priv
trigger: trigger:
stage: triggerPagesVerify stage: trigger
script: script:
- npmci trigger - npmci trigger
only:
- tags
- triggers
tags:
- lossless
- 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: only:
- tags - tags
tags: tags:
- docker - 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

@ -3,7 +3,7 @@ LABEL author="Lossless GmbH <hello@lossless.com>"
WORKDIR /workspace WORKDIR /workspace
# important environment variables # important environment variables
ENV NODE_VERSION_LTS="10.13.0" NODE_VERSION_STABLE="11.2.0" NVM_DIR="/usr/local/nvm" ENV NODE_VERSION_LTS="10.16.0" NODE_VERSION_STABLE="12.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 \
@ -24,6 +24,43 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
rsync \ rsync \
ssh \ ssh \
wget \ wget \
gconf-service \
libasound2 \
libatk1.0-0 \
libatk-bridge2.0-0 \
libc6 \
libcairo2 \
libcups2 \
libdbus-1-3 \
libexpat1 \
libfontconfig1 \
libgcc1 \
libgconf-2-4 \
libgdk-pixbuf2.0-0 \
libglib2.0-0 \
libgtk-3-0 \
libnspr4 \
libpango-1.0-0 \
libpangocairo-1.0-0 \
libstdc++6 \
libx11-6 \
libx11-xcb1 \
libxcb1 \
libxcomposite1 \
libxcursor1 \
libxdamage1 \
libxext6 \
libxfixes3 \
libxi6 \
libxrandr2 \
libxrender1 \
libxss1 \
libxtst6 \
fonts-liberation \
libappindicator1 \
libnss3 \
lsb-release \
xdg-utils \
&& apt-get update \ && apt-get update \
&& apt-get clean \ && apt-get clean \
&& rm -r /var/lib/apt/lists/* && rm -r /var/lib/apt/lists/*

View File

@ -1,19 +0,0 @@
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

11
Dockerfile_iot Normal file
View File

@ -0,0 +1,11 @@
FROM hosttoday/ht-docker-node:latest as stage1
RUN apt-get update && apt-get install -y --no-install-recommends qemu-user-static binfmt-support
# the following lines need to be run on a system that supports both architectures
# update-binfmts --enable qemu-arm \
# && update-binfmts --display qemu-arm \
# && mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc \
# && echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:' > /proc/sys/fs/binfmt_misc/register
FROM arm32v7/node:lts-jessie as stage2
COPY --from=stage1 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static

View File

@ -1,14 +0,0 @@
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

View File

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

View File

@ -1,6 +1,6 @@
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2016 Host.Today Copyright (c) 2016 Lossless GmbH
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

18
npmextra.json Normal file
View File

@ -0,0 +1,18 @@
{
"gitzone": {
"module": {
"githost": "gitlab.com",
"gitscope": "hosttoday",
"gitrepo": "ht-docker-node",
"shortDescription": "docker image with nodejs and shipzone.io support",
"npmPackagename": "@hosttoday/ht-docker-node",
"license": "MIT"
}
},
"npmci": {
"dockerRegistries": [
"docker.io",
"registry.gitlab.com"
]
}
}

View File

@ -1,10 +1,11 @@
{ {
"name": "ht-docker-node", "name": "ht-docker-node",
"version": "5.0.9", "version": "5.0.26",
"description": "docker image with nodejs with shipzone.io support", "description": "docker image with nodejs and shipzone.io support",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"no npm test specified\"",
"build": "echo \"Not needed for now\""
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -15,5 +16,19 @@
"bugs": { "bugs": {
"url": "https://github.com/HostToday/ht-docker-node/issues" "url": "https://github.com/HostToday/ht-docker-node/issues"
}, },
"homepage": "https://github.com/HostToday/ht-docker-node#readme" "homepage": "https://github.com/HostToday/ht-docker-node#readme",
"private": true,
"files": [
"ts/*",
"ts_web/*",
"dist/*",
"dist_web/*",
"assets/*",
"cli.js",
"npmextra.json",
"readme.md"
],
"directories": {
"test": "test"
}
} }

View File

@ -1,18 +1,23 @@
# ht-docker-node # @hosttoday/ht-docker-node
the ultimate docker node image docker image with nodejs and shipzone.io support
## Status ## Availabililty and Links
* [npmjs.org (npm package)](https://www.npmjs.com/package/@hosttoday/ht-docker-node)
* [gitlab.com (source)](https://gitlab.com/hosttoday/ht-docker-node)
* [github.com (source mirror)](https://github.com/hosttoday/ht-docker-node)
* [docs (typedoc)](https://hosttoday.gitlab.io/ht-docker-node/)
## Status for master
[![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)
[![coverage report](https://gitlab.com/hosttoday/ht-docker-node/badges/master/coverage.svg)](https://gitlab.com/hosttoday/ht-docker-node/commits/master)
[Docs](https://hosttoday.gitlab.io/ht-docker-node/) [![npm downloads per month](https://img.shields.io/npm/dm/@hosttoday/ht-docker-node.svg)](https://www.npmjs.com/package/@hosttoday/ht-docker-node)
[![Known Vulnerabilities](https://snyk.io/test/npm/@hosttoday/ht-docker-node/badge.svg)](https://snyk.io/test/npm/@hosttoday/ht-docker-node)
## Availability [![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
Registry | Image Path [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
--- | --- [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
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.
@ -23,18 +28,32 @@ FROM hosttoday/ht-docker-node:npmci
RUN npmci install [node_version_number] // this installs node using node and sets the default to the new node and npm versions RUN npmci install [node_version_number] // this installs node using node and sets the default to the new node and npm versions
``` ```
## Flavour Overview: ## Availability
* **:lts** - node lts version, equals :latest | Registry | Image Path |
* **:stable** - node stable version | --------------- | -------------------------------------------- |
* **:npmci** - npmci preinstalled | GitLab Registry | registry.gitlab.com/hosttoday/ht-docker-node |
* **:npmts** - npmci + npmts preinstalled | Docker Hub | hosttoday/ht-docker-node |
* **:npmpage** - npmci + npmts + npmpage preinstalled
* **:mongo** - npmci + npmts + mongo ## Flavour Overview
- **:lts** - node lts version, equals :latest
- **:stable** - node stable version
- **:npmci** - npmci preinstalled
- **:npmts** - npmci + npmts preinstalled
- **:npmpage** - npmci + npmts + npmpage preinstalled
- **:mongo** - npmci + npmts + mongo
For further information read the linked docs at the top of this README. For further information read the linked docs at the top of this README.
> MIT licensed | **&copy;** [Lossless GmbH](https://lossless.gmbh) > MIT licensed | **&copy;** [Lossless GmbH](https://lossless.gmbh)
| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html) > | 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) [![repo-footer](https://hosttoday.gitlab.io/assets/repo-footer.svg)](https://host.today)
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://maintainedby.lossless.com)

View File

@ -5,5 +5,5 @@ npmci -v
npmci install lts npmci install lts
# check if npm picks it up # check if npm picks it up
npmci command npm install -g @gitzone/gitzone npmci command npm install -g @gitzone/tsrun
npmci command gitzone -v npmci command tsrun -v

View File

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

17
tslint.json Normal file
View File

@ -0,0 +1,17 @@
{
"extends": ["tslint:latest", "tslint-config-prettier"],
"rules": {
"semicolon": [true, "always"],
"no-console": false,
"ordered-imports": false,
"object-literal-sort-keys": false,
"member-ordering": {
"options":{
"order": [
"static-method"
]
}
}
},
"defaultSeverity": "warning"
}