diff --git a/Dockerfile b/Dockerfile
index 19d3817..2fb8f95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,20 @@
FROM node:16.13.1-alpine as build
ENV VUE_APP_NETEASE_API_URL=/api
WORKDIR /app
-RUN apk add --no-cache python3 make g++ git
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories &&\
+ apk add --no-cache python3 make g++ git
COPY package.json yarn.lock ./
RUN yarn install
COPY . .
-RUN yarn build
+RUN yarn config set electron_mirror https://npmmirror.com/mirrors/electron/ && \
+ yarn build
FROM nginx:1.20.2-alpine as app
COPY --from=build /app/package.json /usr/local/lib/
-RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.14/main libuv \
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories &&\
+ apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.14/main libuv \
&& apk add --no-cache --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.14/main nodejs npm \
&& npm i -g $(awk -F \" '{if($2=="NeteaseCloudMusicApi") print $2"@"$4}' /usr/local/lib/package.json) \
&& rm -f /usr/local/lib/package.json
@@ -19,4 +22,4 @@ RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.14/m
COPY --from=build /app/docker/nginx.conf.example /etc/nginx/conf.d/default.conf
COPY --from=build /app/dist /usr/share/nginx/html
-CMD nginx ; exec npx NeteaseCloudMusicApi
+CMD nginx ; exec npx NeteaseCloudMusicApi
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 221b66d..0930218 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,33 @@ services:
volumes:
- /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
+ - ./docker/nginx.conf.example:/etc/nginx/conf.d/default.conf:ro
ports:
- 80:80
restart: always
+ depends_on:
+ - UnblockNeteaseMusic
+ environment:
+ - NODE_TLS_REJECT_UNAUTHORIZED=0
+ networks:
+ my_network:
+
+ UnblockNeteaseMusic:
+ image: pan93412/unblock-netease-music-enhanced
+ command: -o kugou kuwo migu bilibili pyncmd -p 80:443 -f 45.127.129.53 -e -
+ # environment:
+ # JSON_LOG: true
+ # LOG_LEVEL: debug
+ networks:
+ my_network:
+ aliases:
+ - music.163.com
+ - interface.music.163.com
+ - interface3.music.163.com
+ - interface.music.163.com.163jiasu.com
+ - interface3.music.163.com.163jiasu.com
+ restart: always
+
+networks:
+ my_network:
+ driver: bridge
diff --git a/src/components/CoverRow.vue b/src/components/CoverRow.vue
index d0e2163..77eb66e 100644
--- a/src/components/CoverRow.vue
+++ b/src/components/CoverRow.vue
@@ -75,9 +75,9 @@ export default {
return new Date(item.publishTime).getFullYear();
if (this.subText === 'artist') {
if (item.artist !== undefined)
- return `${item.artist.name}`;
+ return `${item.artist.name}`;
if (item.artists !== undefined)
- return `${item.artists[0].name}`;
+ return `${item.artists[0].name}`;
}
if (this.subText === 'albumType+releaseYear') {
let albumType = item.type;
diff --git a/src/components/MvRow.vue b/src/components/MvRow.vue
index f6ee06f..a06fa6a 100644
--- a/src/components/MvRow.vue
+++ b/src/components/MvRow.vue
@@ -73,7 +73,7 @@ export default {
artistName = mv.creator[0].userName;
artistID = mv.creator[0].userId;
}
- return `${artistName}`;
+ return `${artistName}`;
} else if (this.subtitle === 'publishTime') {
return mv.publishTime;
}