Compare commits

...

6 Commits

Author SHA1 Message Date
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
11 changed files with 117 additions and 75 deletions

5
.gitignore vendored
View File

@ -8,9 +8,12 @@ pages/
# installs # installs
node_modules/ node_modules/
# caches and builds # caches
.yarn/ .yarn/
.cache/ .cache/
.rpt2_cache
# builds
dist/ dist/
dist_web/ dist_web/
dist_serve/ dist_serve/

View File

@ -1,76 +1,51 @@
# gitzone docker # gitzone ci_docker
image: hosttoday/ht-docker-node:npmci
cache:
paths:
- .npmci-cache/
key: "$CI_BUILD_STAGE"
before_script:
- 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 image: hosttoday/ht-docker-dbase:npmci
services: services:
- docker:dind - docker:dind
stage: release
stages: script:
- buildAndTest - npmci node install stable
- triggerPagesVerify
before_script:
- npm install -g @shipzone/npmci
- npmci docker login - npmci docker login
buildTest:
stage: buildAndTest
script:
- npmci docker build - npmci docker build
- npmci docker test - 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 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:
- tags
tags:
- docker
artifacts:
expire_in: 1 week
paths:
- public
verify:
stage: triggerPagesVerify
script:
- npmci docker pull registry.gitlab.com test
only: only:
- tags - tags
tags: tags:

View File

@ -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/*

3
Dockerfile_iot 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

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

13
npmextra.json Normal file
View File

@ -0,0 +1,13 @@
{
"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": {}
}

View File

@ -1,6 +1,6 @@
{ {
"name": "ht-docker-node", "name": "ht-docker-node",
"version": "5.0.11", "version": "5.0.14",
"description": "docker image with nodejs and shipzone.io support", "description": "docker image with nodejs and shipzone.io support",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
@ -17,5 +17,15 @@
"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 "private": true,
"files": [
"ts/*",
"ts_web/*",
"dist/*",
"dist_web/*",
"assets/*",
"cli.js",
"npmextra.json",
"readme.md"
]
} }

View File

@ -1,5 +1,5 @@
# @hosttoday/ht-docker-node # @hosttoday/ht-docker-node
docker image with nodejs and ship.zone support docker image with nodejs and shipzone.io support
## Availabililty and Links ## Availabililty and Links
* [npmjs.org (npm package)](https://www.npmjs.com/package/@hosttoday/ht-docker-node) * [npmjs.org (npm package)](https://www.npmjs.com/package/@hosttoday/ht-docker-node)
@ -29,10 +29,11 @@ RUN npmci install [node_version_number] // this installs node using node and set
``` ```
## Availability ## Availability
Registry | Image Path
--- | --- | Registry | Image Path |
GitLab Registry | registry.gitlab.com/hosttoday/ht-docker-node | --------------- | -------------------------------------------- |
Docker Hub | hosttoday/ht-docker-node | GitLab Registry | registry.gitlab.com/hosttoday/ht-docker-node |
| Docker Hub | hosttoday/ht-docker-node |
## Flavour Overview ## Flavour Overview

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 gitzone -v