Merge pull request #8 from leontius/feature/1.0.3

update rrshare bin.
leontius · Jul 17, 2020 · dfb67dc · dfb67dc
2 parents 3ecf513 + 4d2ef40
commit dfb67dc
Show file tree

Hide file tree

Showing 20 changed files with 42 additions and 15 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,30 @@
-FROM centos:7
+FROM lsiobase/alpine:3.12
 USER root
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+LABEL build_version="blog.auskai.win version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="auska"
+
+ENV GLIBC_VERSION=2.31-r0 TZ=Asia/Shanghai
+
+RUN \
+ echo "**** install packages ****" && \
+ apk add --no-cache \
+	wget \
+	libstdc++ && \
+ wget "https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk" && \
+ wget "https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-bin-${GLIBC_VERSION}.apk" && \
+ apk add --allow-untrusted glibc-${GLIBC_VERSION}.apk glibc-bin-${GLIBC_VERSION}.apk && \
+ apk del wget
+
 COPY ./rrshare /opt/rrshare
+
+RUN chown -R root:root /opt/rrshare/ && \
+    chmod a+x /opt/rrshare/rrshareweb && \
+    chmod a+x /opt/rrshare/p4pclient
+
 VOLUME ["/opt/work/store"]
 CMD ["sh", "-c", "/opt/rrshare/rrshareweb"]
 EXPOSE 3001 6714 30210
+VOLUME /mnt /rrshare
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,10 +2,12 @@ version: '2'
 
 services:
   rrshare:
-    image: leontius/rrshareweb:latest
+    image: auska/docker-rrshareweb
     restart: always
     container_name: rrshare
     ports:
       - 3001:3001
+      - 6714:6714
+      - 30210:30210
     volumes:
       - ./store:/opt/work/store
diff --git a/rrshare/.DS_Store b/rrshare/.DS_Store
diff --git a/rrshare/conf/rrshare.db b/rrshare/conf/rrshare.db
diff --git a/rrshare/conf/rrshare.json b/rrshare/conf/rrshare.json
@@ -1,8 +1,9 @@
 {
     "port" : 3001,
+
     "logpath" : "",
     "logqueit" : false,
     "loglevel" : 1,
     "logpersistday" : 2,
-    "defaultsavepath" : "f:/store"
+    "defaultsavepath" : "/opt/work/store"
 }
diff --git a/rrshare/rrshareweb b/rrshare/rrshareweb
diff --git a/rrshare/web/.DS_Store b/rrshare/web/.DS_Store
diff --git a/rrshare/web/build/asset-manifest.json b/rrshare/web/build/asset-manifest.json
@@ -1,6 +1,6 @@
 {
-  "main.css": "static/css/main.7925fcce.css",
-  "main.css.map": "static/css/main.7925fcce.css.map",
-  "main.js": "static/js/main.d30188cd.js",
-  "main.js.map": "static/js/main.d30188cd.js.map"
+  "main.css": "static/css/main.1066d9e7.css",
+  "main.css.map": "static/css/main.1066d9e7.css.map",
+  "main.js": "static/js/main.85f00c62.js",
+  "main.js.map": "static/js/main.85f00c62.js.map"
 }
diff --git a/rrshare/web/build/images/logo.png b/rrshare/web/build/images/logo.png
diff --git a/rrshare/web/build/index.html b/rrshare/web/build/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>人人影视WEB版</title><link href="/static/css/main.7925fcce.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="/static/js/main.d30188cd.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>人人影视WEB版</title><link href="/static/css/main.1066d9e7.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="/static/js/main.85f00c62.js"></script></body></html>
diff --git a/rrshare/web/build/service-worker.js b/rrshare/web/build/service-worker.js
diff --git a/rrshare/web/build/static/css/main.1066d9e7.css b/rrshare/web/build/static/css/main.1066d9e7.css
diff --git a/rrshare/web/build/static/css/main.1066d9e7.css.map b/rrshare/web/build/static/css/main.1066d9e7.css.map
diff --git a/rrshare/web/build/static/css/main.7925fcce.css b/rrshare/web/build/static/css/main.7925fcce.css
diff --git a/rrshare/web/build/static/css/main.7925fcce.css.map b/rrshare/web/build/static/css/main.7925fcce.css.map
diff --git a/rrshare/web/build/static/js/main.85f00c62.js b/rrshare/web/build/static/js/main.85f00c62.js
diff --git a/rrshare/web/build/static/js/main.85f00c62.js.map b/rrshare/web/build/static/js/main.85f00c62.js.map
diff --git a/rrshare/web/build/static/js/main.d30188cd.js b/rrshare/web/build/static/js/main.d30188cd.js
diff --git a/rrshare/web/build/static/js/main.d30188cd.js.map b/rrshare/web/build/static/js/main.d30188cd.js.map
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>人人影视WEB版</title><link href="/static/css/main.7925fcce.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="/static/js/main.d30188cd.js"></script></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>人人影视WEB版</title><link href="/static/css/main.1066d9e7.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="/static/js/main.85f00c62.js"></script></body></html>