From 47e6a8841373b6c9eef360fee273eba4c71684bc Mon Sep 17 00:00:00 2001 From: ehlxr Date: Thu, 5 Dec 2019 11:16:47 +0800 Subject: [PATCH] update at 2019-12-05 11:16:47 by ehlxr --- alpine-mysql/Dockerfile | 14 +++++++++----- alpine/Dockerfile | 2 +- hexo-builder/next/package.json | 17 +++++++++-------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/alpine-mysql/Dockerfile b/alpine-mysql/Dockerfile index 3840501..9e802b4 100644 --- a/alpine-mysql/Dockerfile +++ b/alpine-mysql/Dockerfile @@ -1,14 +1,18 @@ -FROM alpine:latest +FROM ehlxr/alpine +# ehlxr/alpine-mysql LABEL maintainer="ehlxr.me@gmail.com" -ENV TZ "Asia/Shanghai" +# ENV TZ "Asia/Shanghai" WORKDIR /app VOLUME /data -RUN apk add --update --no-cache mysql mysql-client tzdata \ - && ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime \ - && echo ${TZ} > /etc/timezone \ +# RUN apk add --update --no-cache mysql mysql-client tzdata \ +# && ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime \ +# && echo ${TZ} > /etc/timezone \ +# && rm -rf /var/cache/apk/* + +RUN apk add --update --no-cache mysql mysql-client \ && rm -rf /var/cache/apk/* COPY my.cnf /etc/mysql/my.cnf diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 6e2916c..a9661f6 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,5 +1,5 @@ FROM alpine - +# ehlxr/alpine LABEL maintainer="ehlxr " ENV TZ "Asia/Shanghai" diff --git a/hexo-builder/next/package.json b/hexo-builder/next/package.json index 689c1f9..1fb0197 100644 --- a/hexo-builder/next/package.json +++ b/hexo-builder/next/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "hexo": { - "version": "3.9.0" + "version": "4.0.0" }, "scripts": { "prebuild": "hexo clean", @@ -21,9 +21,9 @@ "gulp-imagemin": "^5.0.3", "gulp-plumber": "^1.2.1", "gulp-uglify": "^3.0.2", - "hexo": "^3.9.0", - "hexo-cli": "^2.0.0", - "hexo-deployer-git": "^1.0.0", + "hexo": "^4.0.0", + "hexo-cli": "^3.1.0", + "hexo-deployer-git": "^2.1.0", "hexo-filter-optimize": "^0.2.7", "hexo-generator-archive": "^0.1.5", "hexo-generator-baidu-sitemap": "^0.1.6", @@ -34,14 +34,15 @@ "hexo-generator-sitemap": "^1.2.0", "hexo-generator-tag": "^0.2.0", "hexo-helper-qrcode": "^1.0.2", + "hexo-next-share": "github:theme-next/hexo-next-share", "hexo-related-popular-posts": "^3.0.6", "hexo-renderer-ejs": "^0.3.0", - "hexo-renderer-marked": "^0.3.0", + "hexo-renderer-marked": "^2.0.0", "hexo-renderer-stylus": "^0.3.3", - "hexo-server": "^0.3.3", - "hexo-symbols-count-time": "^0.6.0", + "hexo-server": "^1.0.0", + "hexo-symbols-count-time": "^0.6.1", "hexo-wordcount": "^2.0.1", - "npm": "^6.10.2", + "npm": "^6.11.3", "run-sequence": "^2.2.1", "to": "^0.2.9", "update": "^0.7.4"