Compare commits

...

117 Commits

Author SHA1 Message Date
f10bb7c18d 5.0.79 2022-03-25 16:42:57 +01:00
6b494cdecb fix(core): update 2022-03-25 16:42:56 +01:00
10eed74adf 5.0.78 2022-03-25 16:41:19 +01:00
9014bf95e3 fix(core): update 2022-03-25 16:41:19 +01:00
0b8fbfc343 5.0.77 2022-03-22 15:02:46 +01:00
b4480d73eb fix(core): fix readme 2022-03-22 15:02:45 +01:00
18fc2c673a 5.0.76 2021-11-20 20:46:57 +01:00
8c8bf18610 fix(core): update 2021-11-20 20:46:57 +01:00
304ab9fdbf 5.0.75 2021-11-12 18:46:43 +01:00
2a917dbab4 fix(core): update 2021-11-12 18:46:42 +01:00
7bfb232f63 5.0.74 2021-11-12 18:43:09 +01:00
6adc60f74c fix(core): update 2021-11-12 18:43:09 +01:00
61ef4951f6 5.0.73 2021-11-12 18:24:58 +01:00
a24403304f fix(core): update 2021-11-12 18:24:58 +01:00
4435fa2567 5.0.72 2021-11-12 18:19:15 +01:00
1155205cf7 fix(core): update 2021-11-12 18:19:15 +01:00
8684837a7b 5.0.71 2021-11-07 19:01:54 +01:00
87610140b6 fix(core): update 2021-11-07 19:01:54 +01:00
512955eb0a 5.0.70 2021-11-07 18:44:28 +01:00
a1dda00d41 fix(core): update 2021-11-07 18:44:28 +01:00
0846f649d4 5.0.69 2021-11-07 16:25:14 +01:00
57b66c8172 fix(core): update 2021-11-07 16:25:13 +01:00
939c168712 5.0.68 2021-11-07 16:24:05 +01:00
759754937c fix(core): update 2021-11-07 16:24:04 +01:00
74b25307de 5.0.67 2021-10-22 19:45:49 +02:00
22af5432db fix(core): update 2021-10-22 19:45:49 +02:00
900c126a13 5.0.66 2021-10-22 19:40:16 +02:00
92fd3c36cf fix(core): update 2021-10-22 19:40:16 +02:00
59db72f452 5.0.65 2021-10-22 19:34:40 +02:00
87b1c58e0f fix(core): update 2021-10-22 19:34:39 +02:00
f751354a83 5.0.64 2021-10-22 19:31:15 +02:00
4586a2f34e fix(core): update 2021-10-22 19:31:15 +02:00
ffd299114a 5.0.63 2021-10-19 17:02:28 +02:00
df2cc6ccee fix(core): update 2021-10-19 17:02:27 +02:00
847ff6aded 5.0.62 2021-05-05 15:13:50 +00:00
dd40629f09 fix(core): update 2021-05-05 15:13:50 +00:00
9f2d8ca700 5.0.61 2021-05-05 15:07:22 +00:00
5b6e13f3fd fix(core): update 2021-05-05 15:07:21 +00:00
5f02b4707c 5.0.60 2021-05-05 14:56:39 +00:00
a6c8f5c9fc fix(core): update 2021-05-05 14:56:38 +00:00
934b1b7c2f 5.0.59 2021-05-05 13:48:19 +00:00
cedebef214 fix(core): update 2021-05-05 13:48:18 +00:00
96d8d43018 5.0.58 2021-02-05 21:22:26 +00:00
dcd581929b fix(core): update 2021-02-05 21:22:25 +00:00
d2629cd453 5.0.57 2020-05-27 23:10:49 +00:00
b9070b3a35 fix(core): update 2020-05-27 23:10:48 +00:00
25849cd990 5.0.56 2019-11-26 17:51:30 +00:00
8586b68bf7 5.0.55 2019-11-19 18:02:34 +00:00
9f7b61feeb fix(snyk): now on latest version again 2019-11-19 18:02:33 +00:00
ee58a43ed4 5.0.54 2019-11-19 16:07:55 +00:00
f1dc84f8a8 fix(core): update 2019-11-19 16:07:54 +00:00
d5fa32786c 5.0.53 2019-11-19 16:03:16 +00:00
cd4b629f07 fix(core): update 2019-11-19 16:03:16 +00:00
eca7a18409 5.0.52 2019-10-04 15:24:18 +02:00
1e620394ac 5.0.51 2019-10-02 23:56:42 +02:00
39b3d5df91 5.0.50 2019-10-02 23:40:21 +02:00
2b0cceb822 5.0.49 2019-10-02 12:09:42 +02:00
e25fb766d0 fix(core): update 2019-10-02 12:09:42 +02:00
83f47a5d33 5.0.48 2019-10-02 12:02:42 +02:00
c9b0009cd3 5.0.47 2019-10-02 11:40:10 +02:00
3e58b1c7c6 5.0.46 2019-09-19 19:34:28 +02:00
08515255bb fix(core): update 2019-09-19 19:34:27 +02:00
4cfd049e0c 5.0.45 2019-09-19 17:39:42 +02:00
0472feeaeb fix(core): update 2019-09-19 17:39:42 +02:00
d8b1f5cf83 5.0.44 2019-09-19 16:13:08 +02:00
bc05ac5ce8 fix(core): update 2019-09-19 16:13:08 +02:00
5e58389bbe 5.0.43 2019-09-19 16:11:44 +02:00
2cef721039 fix(core): update 2019-09-19 16:11:44 +02:00
1e5677e7b3 5.0.42 2019-09-01 15:15:56 +02:00
a16aa527e0 5.0.41 2019-09-01 13:59:24 +02:00
8a3ebe4edd 5.0.40 2019-08-31 16:32:16 +02:00
3754370601 fix(core): update 2019-08-31 16:32:16 +02:00
98e9bb7ccd 5.0.39 2019-08-31 16:30:43 +02:00
d15e063c92 fix(core): update 2019-08-31 16:30:43 +02:00
be3ae65d72 5.0.38 2019-08-31 16:21:57 +02:00
b75e5ef366 fix(core): update 2019-08-31 16:21:57 +02:00
fd35505647 5.0.37 2019-08-31 16:20:57 +02:00
c77d2bf370 fix(core): update 2019-08-31 16:20:56 +02:00
28439a4b57 5.0.36 2019-08-31 14:24:53 +02:00
7d68fdf34e 5.0.35 2019-08-27 19:44:57 +02:00
8a0beb0748 fix(core): update 2019-08-27 19:44:57 +02:00
54440f3d87 5.0.34 2019-08-27 19:42:48 +02:00
c3690d0ad0 fix(core): update 2019-08-27 19:42:47 +02:00
469b9cda79 5.0.33 2019-08-23 17:25:47 +02:00
274939af46 fix(core): update 2019-08-23 17:25:47 +02:00
edd645a222 5.0.32 2019-08-23 17:10:07 +02:00
bf3972cf55 fix(core): update 2019-08-23 17:10:07 +02:00
3b581d1e11 5.0.31 2019-07-18 17:18:41 +02:00
d4f83ecdda 5.0.30 2019-07-17 18:01:57 +02:00
b369197763 fix(core): update 2019-07-17 18:01:57 +02:00
52cde0c4d9 5.0.29 2019-07-17 17:19:43 +02:00
e118fab8c6 fix(core): update 2019-07-17 17:19:43 +02:00
b6fe7e1b36 5.0.28 2019-06-19 13:26:45 +02:00
9b264755ab fix(core): update 2019-06-19 13:26:44 +02:00
11d6f9a1ec 5.0.27 2019-06-19 12:03:19 +02:00
fecbcdde64 fix(core): update 2019-06-19 12:03:19 +02:00
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
15 changed files with 72 additions and 24 deletions

View File

@ -1,5 +1,5 @@
# gitzone ci_docker # gitzone ci_docker
image: hosttoday/ht-docker-node:npmci image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
cache: cache:
paths: paths:
@ -15,7 +15,7 @@ stages:
- trigger - trigger
- pages - pages
testSTABLE: testStable:
stage: test stage: test
script: script:
- npmci node install stable - npmci node install stable
@ -26,14 +26,12 @@ testSTABLE:
- docker - docker
release: release:
image: hosttoday/ht-docker-dbase:npmci image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
services: services:
- docker:dind - docker:stable-dind
stage: release stage: release
script: script:
- git clone git://git.qemu.org/qemu.git - npmci node install lts
- (cd qemu && ./configure --target-list=arm-linux-user --static && make && ls -a)
- npmci node install stable
- npmci docker login - npmci docker login
- npmci docker build - npmci docker build
- npmci docker test - npmci docker test

View File

@ -1,19 +1,21 @@
FROM ubuntu:xenial FROM ubuntu:bionic
LABEL author="Lossless GmbH <hello@lossless.com>" 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="16.14.2" NODE_VERSION_STABLE="17.8.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 \
&& apt-get update \ && apt-get update \
&& apt-get upgrade --no-install-recommends -y \ && apt-get upgrade --no-install-recommends -y \
&& apt-get install -y -q --no-install-recommends \ && apt-get install -y -q --no-install-recommends \
# base libs
software-properties-common \ software-properties-common \
apt-transport-https \ apt-transport-https \
build-essential \ build-essential \
ca-certificates \ ca-certificates \
gpg-agent \
curl \ curl \
g++ \ g++ \
gcc \ gcc \
@ -21,13 +23,14 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
make \ make \
openssl \ openssl \
python \ python \
python3 \
rsync \ rsync \
ssh \ ssh \
wget \ wget \
# puppeteer
gconf-service \ gconf-service \
libasound2 \ libasound2 \
libatk1.0-0 \ libatk1.0-0 \
libatk-bridge2.0-0 \
libc6 \ libc6 \
libcairo2 \ libcairo2 \
libcups2 \ libcups2 \
@ -56,12 +59,23 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
libxrender1 \ libxrender1 \
libxss1 \ libxss1 \
libxtst6 \ libxtst6 \
ca-certificates \
fonts-liberation \ fonts-liberation \
libappindicator1 \ libappindicator1 \
libnss3 \ libnss3 \
lsb-release \ lsb-release \
xdg-utils \ xdg-utils \
# chrome
&& wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
&& apt install -y -q --no-install-recommends ./google-chrome-stable_current_amd64.deb \
# mongodb
&& curl -fsSL https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add - \
&& echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list \
&& apt-get update \ && apt-get update \
&& apt-get install -y -q --no-install-recommends \
mongodb-org \
&& apt-get clean \ && apt-get clean \
&& rm -r /var/lib/apt/lists/* && rm -r /var/lib/apt/lists/*

View File

@ -1,3 +1,10 @@
FROM node:11.3.0-alpine FROM node:17.8.0-alpine
LABEL author="Lossless GmbH <hello@lossless.com>" LABEL author="Lossless GmbH <hello@lossless.com>"
RUN apk update && apk add bash libc6-compat RUN apk update && apk add bash libc6-compat alpine-sdk
ENV PYTHONUNBUFFERED=1
RUN apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python
RUN python3 -m ensurepip
RUN pip3 install --no-cache --upgrade pip setuptools
ENV NODE_OPTIONS="--max_old_space_size=1000"

View File

@ -1,3 +1,12 @@
FROM node:11.3.0-alpine FROM hosttoday/ht-docker-node:stable as stage1
LABEL author="Lossless GmbH <hello@lossless.com>" LABEL author="Lossless GmbH <hello@lossless.com>"
RUN apk update && apk add bash libc6-compat 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

@ -6,6 +6,7 @@ RUN bash -c "source $NVM_DIR/nvm.sh \
&& 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 config set unsafe-perm true \
&& npm install -g agentkeepalive \
&& 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

@ -6,6 +6,7 @@ RUN bash -c "source $NVM_DIR/nvm.sh \
&& 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 config set unsafe-perm true \
&& npm install -g agentkeepalive \
&& 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

6
Dockerfile_stableinit Normal file
View File

@ -0,0 +1,6 @@
FROM hosttoday/ht-docker-node:stable
# Add Tini
ENV TINI_VERSION v0.19.0
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
RUN chmod +x /tini
ENTRYPOINT ["/tini", "--"]

View File

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

View File

@ -9,5 +9,10 @@
"license": "MIT" "license": "MIT"
} }
}, },
"npmci": {} "npmci": {
"dockerRegistries": [
"docker.io",
"registry.gitlab.com"
]
}
} }

5
package-lock.json generated Normal file
View File

@ -0,0 +1,5 @@
{
"name": "ht-docker-node",
"version": "5.0.79",
"lockfileVersion": 1
}

View File

@ -1,6 +1,6 @@
{ {
"name": "ht-docker-node", "name": "ht-docker-node",
"version": "5.0.15", "version": "5.0.79",
"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": {
@ -23,6 +23,7 @@
"ts_web/*", "ts_web/*",
"dist/*", "dist/*",
"dist_web/*", "dist_web/*",
"dist_ts_web/*",
"assets/*", "assets/*",
"cli.js", "cli.js",
"npmextra.json", "npmextra.json",

View File

@ -1,5 +1,5 @@
# @hosttoday/ht-docker-node # @hosttoday/ht-docker-node
docker image with nodejs and shipzone.io support docker image with nodejs and [ship.zone](https://ship.zone) 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)
@ -54,6 +54,6 @@ 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. 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)
[![repo-footer](https://hosttoday.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com) [![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

View File

@ -1,8 +1,9 @@
# check if npmci is available # check if npmci is available
npm init -y
npmci -v npmci -v
# check if we can use lts # TODO update npmci to not require package.json
npmci install lts npmci node install stable
# check if npm picks it up # check if npm picks it up
npmci command npm install -g @gitzone/tsrun npmci command npm install -g @gitzone/tsrun

View File

@ -2,4 +2,4 @@
npm -v npm -v
node -v node -v
npm install -g @gitzone/tsrun npm install -g @gitzone/tsrun
gitzone -v # tsrun -v