From ca22e3343a842c1a9f87ee4501fe33fb60318ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20L?= Date: Wed, 7 Jun 2017 18:07:28 +0200 Subject: [PATCH 1/2] update README This reverts commit 4663d8ed03376d0bf66eec0be9cebb0c1b1adc9a, reversing changes made to 201ddd43024b7000107a2c4e5a403d1ec9c10a95. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 99041d2b..7f7cc7a6 100644 --- a/README.md +++ b/README.md @@ -110,21 +110,21 @@ This is the official Docker container for PlexTogether: https://hub.docker.com/r The following tags are available: * latest / alpine: webapp and server based on alpine -* debian: webapp and server based on debian * server: only server based on alpine * dev: development version of webapp and server based on alpine * nginx: latest + nginx reverse proxy ``` -docker create \ +docker run \ --name=plextogether \ -p 8088:8088 \ -p 8089:8089 \ + -e DOMAIN=example.com \ starbix/plextogether ``` Use this for the nginx tag: ``` -docker create \ - --name=plextogether \ +docker run \ + --name=plextogether_nginx \ -p 80:80 \ -e DOMAIN=example.com \ starbix/plextogether:nginx From 72801afdf39ab3dbda0878c21632066d27ed109c Mon Sep 17 00:00:00 2001 From: samcm Date: Mon, 19 Jun 2017 14:19:11 +1000 Subject: [PATCH 2/2] Fix for vue/loader version mismatch --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3385d9d0..e11f60d4 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,6 @@ "videojs-contrib-hls": "^5.5.2", "videojs-resolution-switcher": "^0.4.2", "videojs-settings-menu": "0.0.2", - "vue": "2.3.3", "vue-animate": "0.0.4", "vue-clipboards": "^0.2.6", "vue-easy-toast": "^1.0.1", @@ -103,8 +102,10 @@ "sinon": "^1.17.3", "sinon-chai": "^2.8.0", "url-loader": "^0.5.7", - "vue-loader": "^9.4.0", + "vue": "^2.3.4", + "vue-loader": "^12.2.1", "vue-style-loader": "^1.0.0", + "vue-template-compiler": "^2.3.4", "webpack": "^1.13.2", "webpack-dev-middleware": "^1.8.3", "webpack-hot-middleware": "^2.12.2",