Skip to content

Commit

Permalink
Merge pull request #3 from Alethio/v2.4.12
Browse files Browse the repository at this point in the history
V2.4.12
  • Loading branch information
baxy authored Jan 15, 2019
2 parents b3f727f + 70b8862 commit 724c5c7
Show file tree
Hide file tree
Showing 8 changed files with 252 additions and 197 deletions.
53 changes: 35 additions & 18 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,45 @@
version: 2

jobs:
build:
docker:
# specify the version you desire here
- image: circleci/node:latest

working_directory: ~/repo

steps:
- checkout
- run:
name: Install Node Modules
command: npm install
- run:
name: Gulp Lint
command: npm run gulp lint
- run:
name: Gulp Build
command: npm run gulp prepare

# Download and cache dependencies
- restore_cache:
keys:
- v1-dependencies-{{ checksum "package.json" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-

- run: npm install

- save_cache:
paths:
- node_modules
key: v1-dependencies-{{ checksum "package.json" }}
trigger-docker-hub:
docker:
- image: circleci/node:latest
working_directory: ~/repo
steps:
- checkout
- run:
name: Trigger DockerHub
command: ./triggerDockerHub.sh

# run tests!
- run: npm run gulp prepare
workflows:
version: 2
deploy:
jobs:
- build:
filters:
tags:
only: /.*/
- trigger-docker-hub:
requires:
- build
filters:
tags:
only: /^v[0-9.]+$/
branches:
only: master
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Changelog
All notable changes to this project will be documented in this file.

## [2.4.12] - 2019-01-15
- Added CircleCI workflow to trigger docker hub build sequentially
- Updated Dockerfile to use node:alpine for smaller image size

## [2.4.11] - 2018-12-20
- Fixed basic auth when Web3 HttpProvider is used

Expand Down
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
FROM node:latest
FROM node:alpine

RUN apk update && \
apk add --no-cache git python g++ make procps

WORKDIR /ethstats-cli

COPY package.json package-lock.json .babelrc ./

RUN npm install -g gulp-cli
RUN npm install

COPY . .

RUN gulp prepare
RUN npm run gulp prepare

ENTRYPOINT ["./bin/ethstats-cli.js", "-vd"]
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# ethstats-cli [![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Dependency Status][daviddm-image]][daviddm-url] [![Coverage percentage][coveralls-image]][coveralls-url]

> EthStats Network CLI client.
> EthStats - Network Monitor - CLI Client
>
>
> This app connects to your Ethereum node through RPC and extract data that will be sent to the ethstats server for analytics purposes. Stats are displayed on [net.ethstats.io](https://net.ethstats.io/)
> The client application connects to your Ethereum node through RPC and extract data that will be sent to the `EthStats - Network Monitor - Server` for analytics purposes. Stats are displayed on [net.ethstats.io](https://net.ethstats.io/)
# Contents
- [Getting Started](#getting-started)
Expand Down
10 changes: 5 additions & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const coveralls = require('gulp-coveralls');
// Initialize the babel transpiler so ES2015 files gets compiled when they're loaded
require('@babel/register');

gulp.task('static', function () {
gulp.task('lint', function () {
return gulp.src('**/*.js')
.pipe(plumber())
.pipe(excludeGitignore())
Expand All @@ -32,13 +32,13 @@ gulp.task('clean', function () {
return del('dist');
});

gulp.task('babel', gulp.series('clean', function () {
gulp.task('babel', () => {
return gulp.src('lib/**/*.js')
.pipe(plumber())
.pipe(babel())
.pipe(gulp.dest('dist'));
}));
});

gulp.task('prepare', gulp.series('babel'));
gulp.task('prepare', gulp.series('clean', 'babel'));

gulp.task('default', gulp.series('static', 'coveralls'));
gulp.task('default', gulp.series('lint', 'coveralls'));
Loading

0 comments on commit 724c5c7

Please sign in to comment.