Skip to content
This repository has been archived by the owner on Jan 17, 2020. It is now read-only.

Commit

Permalink
Merge branch 'feature/nodev8_npm5'
Browse files Browse the repository at this point in the history
Close #6
  • Loading branch information
weierophinney committed Sep 27, 2017
2 parents f86c896 + 575a2bf commit 23383e8
Show file tree
Hide file tree
Showing 5 changed files with 2,353 additions and 1,476 deletions.
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,29 @@

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## 0.7.0 - 2017-09-27

### Added

- Nothing.

### Changed

- [#6](https://github.com/zendframework/zfbot/pull/6) updates the hubot
container to use nodejs v8 + npm v5, eliminating the need for yarn.

### Deprecated

- Nothing.

### Removed

- Nothing.

### Fixed

- Nothing.

## 0.6.4 - 2017-08-14

### Added
Expand Down
2 changes: 1 addition & 1 deletion docker-stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
- /data:/data

hubot:
image: "mwop/zfbot:0.7.4"
image: "mwop/zfbot:0.8.0"
depends_on:
- redis
env_file:
Expand Down
13 changes: 5 additions & 8 deletions etc/docker/hubot.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@ FROM ubuntu:zesty

RUN apt-get update
RUN apt-get -y install apt-utils apt-transport-https build-essential curl
RUN curl -sL https://deb.nodesource.com/setup_7.x | bash -
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
RUN apt-get update
RUN apt-get -y install nodejs yarn git python3-pip php7.0-cli
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
RUN apt-get -y install nodejs git python3-pip php7.0-cli
RUN pip3 install mkdocs pymdown-extensions
RUN yarn global add gulp
RUN npm install --global gulp

RUN mkdir /hubot
ADD bin /hubot/bin
Expand All @@ -19,9 +16,9 @@ ADD lib /hubot/lib
ADD scripts /hubot/scripts
COPY external-scripts.json /hubot/
COPY package.json /hubot/
COPY yarn.lock /hubot/
COPY package-lock.json /hubot/

RUN cd /hubot && yarn install
RUN cd /hubot && npm install --no-save

EXPOSE 9001

Expand Down
Loading

0 comments on commit 23383e8

Please sign in to comment.