Skip to content

Commit d9a8243

Browse files
authored
Merge pull request #163 from acelaya-forks/feature/update-deps
Feature/update deps
2 parents a7f7666 + 232c548 commit d9a8243

File tree

16 files changed

+6853
-6748
lines changed

16 files changed

+6853
-6748
lines changed

.scrutinizer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
build:
22
environment:
3-
node: v10.15.3
3+
node: v12.11.0
44
tools:
55
external_code_coverage:
66
timeout: 1200

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: node_js
22

33
node_js:
4-
- "10.16.3"
4+
- "12.11.0"
55

66
cache:
77
directories:

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ All notable changes to this project will be documented in this file.
44

55
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).
66

7-
## [Unreleased]
7+
## 2.2.0 - 2019-10-05
88

99
#### Added
1010

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

1313
#### Changed
1414

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

1717
#### Deprecated
1818

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM node:10.16.3-alpine as node
1+
FROM node:12.11.0-alpine as node
22
COPY . /shlink-web-client
33
RUN cd /shlink-web-client && npm install && npm run build
44

5-
FROM nginx:1.17.3-alpine
5+
FROM nginx:1.17.4-alpine
66
LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
77
RUN rm -r /usr/share/nginx/html && rm /etc/nginx/conf.d/default.conf
88
COPY config/docker/nginx.conf /etc/nginx/conf.d/default.conf

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: '3'
33
services:
44
shlink_web_client_node:
55
container_name: shlink_web_client_node
6-
image: node:10.16.3-alpine
6+
image: node:12.11.0-alpine
77
command: /bin/sh -c "cd /home/shlink/www && npm install && npm run start"
88
volumes:
99
- ./:/home/shlink/www

0 commit comments

Comments
 (0)