Compare commits

...

50 Commits

Author SHA1 Message Date
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
10 changed files with 79 additions and 29 deletions

View File

@ -1,5 +1,5 @@
# gitzone docker # gitzone docker
image: hosttoday/ht-docker-dbase:latest image: hosttoday/ht-docker-dbase:npmci
services: services:
- docker:dind - docker:dind
variables: variables:
@ -7,6 +7,7 @@ variables:
stages: stages:
- buildAndTest
- build - build
- test - test
- release - release
@ -14,12 +15,28 @@ stages:
- pages - pages
before_script: before_script:
- npmci prepare docker - yarn global add npmci
- npmci docker login
buildAndTest:
stage: buildAndTest
script:
- npmci docker build
- npmci docker test
except:
- tags
tags:
- lossless
- priv
build: build:
stage: build stage: build
script: script:
- npmci build docker - npmci docker build
- npmci docker push registry.gitlab.com test
only:
- tags
- triggers
tags: tags:
- lossless - lossless
- priv - priv
@ -28,7 +45,11 @@ build:
test: test:
stage: test stage: test
script: script:
- npmci test docker - npmci docker pull registry.gitlab.com test
- npmci docker test
only:
- tags
- triggers
tags: tags:
- lossless - lossless
- priv - priv
@ -36,7 +57,9 @@ test:
release: release:
stage: release stage: release
script: script:
- npmci publish docker - npmci docker pull registry.gitlab.com test
- npmci docker push docker.io
- npmci docker push registry.gitlab.com
only: only:
- tags - tags
- triggers - triggers

View File

@ -1,4 +1,4 @@
FROM ubuntu:latest FROM ubuntu:xenial
MAINTAINER Lossless GmbH <office@lossless.com> MAINTAINER Lossless GmbH <office@lossless.com>
# important environment variables # important environment variables
@ -14,11 +14,15 @@ 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 \
ssh \
wget \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
&& apt-get update \ && apt-get update \

View File

@ -5,6 +5,7 @@ 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,7 +1,7 @@
FROM hosttoday/ht-docker-node:stable FROM hosttoday/ht-docker-node:stable
MAINTAINER Lossless GmbH <office@lossless.com> MAINTAINER Lossless GmbH <office@lossless.com>
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927 \ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6 \
&& 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 \ && echo "deb [ arch=amd64,arm64 ] http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.4.list \
&& apt-get update \ && apt-get update \
&& apt-get install -y mongodb-org && apt-get install -y mongodb-org

View File

@ -1,23 +1,14 @@
FROM hosttoday/ht-docker-node:npmci FROM hosttoday/ht-docker-node:npmci
MAINTAINER Lossless GmbH <office@lossless.com> MAINTAINER Lossless GmbH <office@lossless.com>
# Java Version # Install Java.
ENV JAVA_VERSION=9 \ RUN \
JAVA_UPDATE=ea \ echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
JAVA_BUILD=168 \ add-apt-repository -y ppa:webupd8team/java && \
JAVA_HOME=/usr/lib/jvm/current-java apt-get update && \
apt-get install -y oracle-java8-installer && \
rm -rf /var/lib/apt/lists/* && \
rm -rf /var/cache/oracle-jdk8-installer
# JDK: http://www.java.net/download/java/jdk9/archive/145/binaries/jdk-9-ea+145_linux-x64_bin.tar.gz # Define commonly used JAVA_HOME variable
# JRE: http://www.java.net/download/java/jdk9/archive/145/binaries/jre-9-ea+145_linux-x64_bin.tar.gz ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
# JRE
RUN cd /tmp && wget --header "Cookie: oraclelicense=accept-securebackup-cookie;" \
"http://www.java.net/download/java/jdk9/archive/${JAVA_BUILD}/binaries/jre-${JAVA_VERSION}-${JAVA_UPDATE}+${JAVA_BUILD}_linux-x64_bin.tar.gz" && \
tar xzf "jre-${JAVA_VERSION}-${JAVA_UPDATE}+${JAVA_BUILD}_linux-x64_bin.tar.gz" && \
mkdir -p /usr/lib/jvm && mv "/tmp/jre-${JAVA_VERSION}" "/usr/lib/jvm/java-${JAVA_VERSION}-oracle" && \
ln -s "java-${JAVA_VERSION}-oracle" $JAVA_HOME && \
ln -s $JAVA_HOME/bin/java /usr/bin/java && \
rm -rf $JAVA_HOME/*.txt && \
rm -rf $JAVA_HOME/*.html && \
apk del wget ca-certificates curl && \
rm /tmp/* /var/cache/apk/*

19
Dockerfile_npmpage Normal file
View File

@ -0,0 +1,19 @@
FROM hosttoday/ht-docker-node:stable
RUN apt-get update && apt-get install -y python-pip
RUN npmci command yarn global add npmpage
RUN pip install --upgrade pip \
&& pip install mkdocs \
&& mkdocs --version \
&& pip install mkdocs-material \
&& pip install pygments \
&& pip install pymdown-extensions
# Set working directory
WORKDIR /docs
# Expose MkDocs development server port
EXPOSE 8000
# Start development server by default
ENTRYPOINT ["mkdocs"]
CMD ["serve", "--dev-addr=0.0.0.0:8000"]

View File

@ -4,6 +4,7 @@ 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,3 +1,7 @@
---
name: ht-docker-node
description: the ultimate docker-node image
---
# ht-docker-node # ht-docker-node
the ultimate docker node image the ultimate docker node image
@ -26,10 +30,16 @@ RUN npmci install [node_version_number] // this installs node using node and set
* **:lts** - node lts version, equals :latest * **:lts** - node lts version, equals :latest
* **:stable** - node stable version * **:stable** - node stable version
* **:npmci** - npmci preinstalled * **:npmci** - npmci preinstalled
* **:npmcijava - npmci + java
* **: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
## optimized for performance with npmci and npmts
Take a goof look at the **npmts** and **npmci** tools on npm. They make development of TypeScript node modules rediculouly easy :)
The **:npmcijava** flavour works together with **smartwebdriver** so you can test all your cool polymer elements in a headless chrome environment or sauce :)
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)

View File

@ -1,6 +1,6 @@
{ {
"name": "ht-docker-node", "name": "ht-docker-node",
"version": "4.3.20", "version": "4.3.41",
"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": {

1
test/test_npmpage.sh Normal file
View File

@ -0,0 +1 @@
mkdocs --version