浏览代码

Ditch gulp.

master
Chris Smith 7 年前
父节点
当前提交
453f443f5d
共有 3 个文件被更改,包括 21 次插入36 次删除
  1. 1
    32
      Dockerfile
  2. 10
    2
      docker-compose.dev.yml
  3. 10
    2
      docker-compose.yml

+ 1
- 32
Dockerfile 查看文件

@@ -1,33 +1,2 @@
1
-FROM debian:stretch-slim
2
-MAINTAINER dkr@chameth.com
1
+FROM publysher/hugo
3 2
 
4
-RUN apt-get -qq update \
5
-	&& DEBIAN_FRONTEND=noninteractive apt-get -qq install -y curl --no-install-recommends ca-certificates apt-transport-https nginx gnupg1
6
-
7
-RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
8
-RUN echo 'deb https://deb.nodesource.com/node_6.x jessie main' > /etc/apt/sources.list.d/nodesource.list
9
-
10
-# Install pygments (for syntax highlighting)
11
-RUN apt-get -qq update \
12
-	&& DEBIAN_FRONTEND=noninteractive apt-get -qq install -y --no-install-recommends python-pygments git asciidoc nodejs \
13
-	&& rm -rf /var/lib/apt/lists/*
14
-
15
-# Download and install hugo
16
-ENV HUGO_VERSION 0.21
17
-ENV HUGO_BINARY hugo_${HUGO_VERSION}_Linux-64bit.deb
18
-ADD https://github.com/spf13/hugo/releases/download/v${HUGO_VERSION}/${HUGO_BINARY} /tmp/hugo.deb
19
-RUN dpkg -i /tmp/hugo.deb \
20
-	&& rm /tmp/hugo.deb
21
-
22
-# Create working directory
23
-RUN rm -rf /var/www && mkdir /var/www
24
-WORKDIR /var/www/
25
-ADD site/ /var/www
26
-
27
-RUN npm install --global gulp-cli && npm install
28
-
29
-RUN gulp
30
-
31
-EXPOSE 80
32
-STOPSIGNAL SIGQUIT
33
-CMD ["nginx", "-g", "daemon off;"]

+ 10
- 2
docker-compose.dev.yml 查看文件

@@ -3,10 +3,18 @@
3 3
 version: '2'
4 4
 
5 5
 services:
6
-
7 6
   hugo:
8 7
     build: .
9 8
     restart: always
10 9
     labels:
11 10
       com.chameth.vhost: 'dev.chameth.com'
12
-      com.chameth.proxy: '80'
11
+      com.chameth.proxy: '1313'
12
+    command:
13
+      - hugo
14
+      - server
15
+      - --bind=0.0.0.0
16
+      - --port=1313
17
+      - --baseURL=https://dev.chameth.com/
18
+      - --appendPort=false
19
+      - --disableLiveReload
20
+      - --log

+ 10
- 2
docker-compose.yml 查看文件

@@ -3,10 +3,18 @@
3 3
 version: '2'
4 4
 
5 5
 services:
6
-
7 6
   hugo:
8 7
     build: .
9 8
     restart: always
10 9
     labels:
11 10
       com.chameth.vhost: 'chameth.com,www.chameth.com'
12
-      com.chameth.proxy: '80'
11
+      com.chameth.proxy: '1313'
12
+    command:
13
+      - hugo
14
+      - server
15
+      - --bind=0.0.0.0
16
+      - --port=1313
17
+      - --baseURL=https://www.chameth.com/
18
+      - --appendPort=false
19
+      - --disableLiveReload
20
+      - --log

正在加载...
取消
保存