Skip to content

Commit

Permalink
Merge pull request #163 from acelaya-forks/feature/update-deps
Browse files Browse the repository at this point in the history
Feature/update deps
  • Loading branch information
acelaya committed Oct 5, 2019
2 parents a7f7666 + 232c548 commit d9a8243
Show file tree
Hide file tree
Showing 16 changed files with 6,853 additions and 6,748 deletions.
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
build:
environment:
node: v10.15.3
node: v12.11.0
tools:
external_code_coverage:
timeout: 1200
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js

node_js:
- "10.16.3"
- "12.11.0"

cache:
directories:
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org).

## [Unreleased]
## 2.2.0 - 2019-10-05

#### Added

* [#144](https://github.com/shlinkio/shlink-web-client/issues/144) Added domain input to create domain page.

#### Changed

* *Nothing*
* [#140](https://github.com/shlinkio/shlink-web-client/issues/140) Updated project dependencies.

#### Deprecated

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM node:10.16.3-alpine as node
FROM node:12.11.0-alpine as node
COPY . /shlink-web-client
RUN cd /shlink-web-client && npm install && npm run build

FROM nginx:1.17.3-alpine
FROM nginx:1.17.4-alpine
LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
RUN rm -r /usr/share/nginx/html && rm /etc/nginx/conf.d/default.conf
COPY config/docker/nginx.conf /etc/nginx/conf.d/default.conf
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3'
services:
shlink_web_client_node:
container_name: shlink_web_client_node
image: node:10.16.3-alpine
image: node:12.11.0-alpine
command: /bin/sh -c "cd /home/shlink/www && npm install && npm run start"
volumes:
- ./:/home/shlink/www
Expand Down

0 comments on commit d9a8243

Please sign in to comment.