diff options
author | clarkzjw <[email protected]> | 2018-01-18 13:44:22 +0800 |
---|---|---|
committer | GitHub <[email protected]> | 2018-01-18 13:44:22 +0800 |
commit | 39509c19a9f758ede935638acd98150b99d2b33d (patch) | |
tree | 74e0313a2029dfcdac57c9eaf431223305533c1c /_posts/2018/01 | |
parent | 50def653ece79940e270f741942c99b5a223cc15 (diff) | |
parent | e12cf1463848faa973d7c2ec174892655d131c22 (diff) | |
download | blog.jinwei.me-39509c19a9f758ede935638acd98150b99d2b33d.tar.gz |
Merge pull request #3 from clarkzjw/replace_space
+ fix
Diffstat (limited to '_posts/2018/01')
-rw-r--r-- | _posts/2018/01/new-blog.rst | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/_posts/2018/01/new-blog.rst b/_posts/2018/01/new-blog.rst index 7e656e3..a638797 100644 --- a/_posts/2018/01/new-blog.rst +++ b/_posts/2018/01/new-blog.rst | |||
@@ -36,35 +36,11 @@ Dockerfile中生成静态html网页,然后在构建的过程中将静态网页 | |||
36 | 构建的镜像已经上百MB了。有了multi stage build之后,这个问题便非常好地被解决了。看了下面的Dockerfile之后,整体思路就非常清晰了。目前我 | 36 | 构建的镜像已经上百MB了。有了multi stage build之后,这个问题便非常好地被解决了。看了下面的Dockerfile之后,整体思路就非常清晰了。目前我 |
37 | 在本地写完rst文本,然后git push之后,CircleCI会自动进行Dockerfile的构建,然后将编译生成的静态html推送到gh-pages分支。 | 37 | 在本地写完rst文本,然后git push之后,CircleCI会自动进行Dockerfile的构建,然后将编译生成的静态html推送到gh-pages分支。 |
38 | 38 | ||
39 | .. code-block:: bash | 39 | .. raw:: html |
40 | |||
41 | FROM python:3.6.0 as builder | ||
42 | LABEL maintainer=clarkzjw<[email protected]> | ||
43 | RUN pip install virtualenv | ||
44 | COPY requirements.txt /app/requirements.txt | ||
45 | COPY bootstrap.py /app/bootstrap.py | ||
46 | RUN /app/bootstrap.py | ||
47 | ADD . /app | ||
48 | WORKDIR /app | ||
49 | RUN /bin/bash -c "source /app/.venv/bin/activate && make html && make rss && cp rss.xml _build/html" | ||
50 | |||
51 | |||
52 | FROM alpine:latest | ||
53 | RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories | ||
54 | RUN apk add --update git openssh-client && rm -rf /var/cache/apk/* | ||
55 | WORKDIR /html | ||
56 | ENV COMMIT_USER="clarkzjw" | ||
57 | ENV COMMIT_EMAIL="[email protected]" | ||
58 | ARG GIT_TOKEN="" | ||
59 | RUN git config --global user.email $COMMIT_EMAIL && git config --global user.name $COMMIT_USER | ||
60 | RUN git clone https://clarkzjw:[email protected]/clarkzjw/blog.jinwei.me.git /html && git checkout gh-pages | ||
61 | COPY --from=builder /app/_build/html /html | ||
62 | RUN echo "`date`" > /html/.lastmodify && git add -A && git commit -m "`date`" && git push origin gh-pages | ||
63 | |||
64 | |||
65 | FROM nginx:alpine | ||
66 | COPY --from=builder /app/_build/html /usr/share/nginx/html | ||
67 | 40 | ||
41 | <embed> | ||
42 | <script src="https://gist.github.com/clarkzjw/0cb4e15794a5a132b12df9741e0cc1e0.js"></script> | ||
43 | </embed> | ||
68 | 44 | ||
69 | 另外一个问题是博客的RSS。由于Sphinx最初的设计是作为一个文档生成工具,目前市面上有的和Sphinx结合的RSS生成工具大致有: | 45 | 另外一个问题是博客的RSS。由于Sphinx最初的设计是作为一个文档生成工具,目前市面上有的和Sphinx结合的RSS生成工具大致有: |
70 | 46 | ||