Compare commits
71 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7bfb232f63 | |||
| 6adc60f74c | |||
| 61ef4951f6 | |||
| a24403304f | |||
| 4435fa2567 | |||
| 1155205cf7 | |||
| 8684837a7b | |||
| 87610140b6 | |||
| 512955eb0a | |||
| a1dda00d41 | |||
| 0846f649d4 | |||
| 57b66c8172 | |||
| 939c168712 | |||
| 759754937c | |||
| 74b25307de | |||
| 22af5432db | |||
| 900c126a13 | |||
| 92fd3c36cf | |||
| 59db72f452 | |||
| 87b1c58e0f | |||
| f751354a83 | |||
| 4586a2f34e | |||
| ffd299114a | |||
| df2cc6ccee | |||
| 847ff6aded | |||
| dd40629f09 | |||
| 9f2d8ca700 | |||
| 5b6e13f3fd | |||
| 5f02b4707c | |||
| a6c8f5c9fc | |||
| 934b1b7c2f | |||
| cedebef214 | |||
| 96d8d43018 | |||
| dcd581929b | |||
| d2629cd453 | |||
| b9070b3a35 | |||
| 25849cd990 | |||
| 8586b68bf7 | |||
| 9f7b61feeb | |||
| ee58a43ed4 | |||
| f1dc84f8a8 | |||
| d5fa32786c | |||
| cd4b629f07 | |||
| eca7a18409 | |||
| 1e620394ac | |||
| 39b3d5df91 | |||
| 2b0cceb822 | |||
| e25fb766d0 | |||
| 83f47a5d33 | |||
| c9b0009cd3 | |||
| 3e58b1c7c6 | |||
| 08515255bb | |||
| 4cfd049e0c | |||
| 0472feeaeb | |||
| d8b1f5cf83 | |||
| bc05ac5ce8 | |||
| 5e58389bbe | |||
| 2cef721039 | |||
| 1e5677e7b3 | |||
| a16aa527e0 | |||
| 8a3ebe4edd | |||
| 3754370601 | |||
| 98e9bb7ccd | |||
| d15e063c92 | |||
| be3ae65d72 | |||
| b75e5ef366 | |||
| fd35505647 | |||
| c77d2bf370 | |||
| 28439a4b57 | |||
| 7d68fdf34e | |||
| 8a0beb0748 |
@@ -1,7 +1,5 @@
|
|||||||
# gitzone ci_docker
|
# gitzone ci_docker
|
||||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||||
variables:
|
|
||||||
GIT_STRATEGY: clone
|
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
paths:
|
paths:
|
||||||
@@ -17,10 +15,10 @@ stages:
|
|||||||
- trigger
|
- trigger
|
||||||
- pages
|
- pages
|
||||||
|
|
||||||
testLTS:
|
testStable:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- npmci node install lts
|
- npmci node install stable
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci npm test
|
- npmci npm test
|
||||||
coverage: /\d+.?\d+?\%\s*coverage/
|
coverage: /\d+.?\d+?\%\s*coverage/
|
||||||
@@ -30,7 +28,7 @@ testLTS:
|
|||||||
release:
|
release:
|
||||||
image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
|
image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
|
||||||
services:
|
services:
|
||||||
- docker:18-dind
|
- docker:stable-dind
|
||||||
stage: release
|
stage: release
|
||||||
script:
|
script:
|
||||||
- npmci node install lts
|
- npmci node install lts
|
||||||
|
|||||||
21
Dockerfile
21
Dockerfile
@@ -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.16.3" NODE_VERSION_STABLE="12.8.1" NVM_DIR="/usr/local/nvm"
|
ENV NODE_VERSION_LTS="14.18.1" NODE_VERSION_STABLE="16.11.1" 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,22 @@ 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 \
|
||||||
&& apt-get update \
|
|
||||||
|
# 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 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/*
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,10 @@
|
|||||||
FROM node:12.8.1-alpine
|
FROM node:14.15.4-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"
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM hosttoday/ht-docker-node:latest as stage1
|
FROM hosttoday/ht-docker-node:stable as stage1
|
||||||
LABEL author="Lossless GmbH <hello@lossless.com>"
|
LABEL author="Lossless GmbH <hello@lossless.com>"
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends qemu-user-static binfmt-support
|
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
|
# the following lines need to be run on a system that supports both architectures
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
5
package-lock.json
generated
Normal file
5
package-lock.json
generated
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"name": "ht-docker-node",
|
||||||
|
"version": "5.0.74",
|
||||||
|
"lockfileVersion": 1
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ht-docker-node",
|
"name": "ht-docker-node",
|
||||||
"version": "5.0.34",
|
"version": "5.0.74",
|
||||||
"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": {
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user