From 105e2e8ee3fd601357a49788437b81d00815978a Mon Sep 17 00:00:00 2001 From: Shohei Ueda <30958501+peaceiris@users.noreply.github.com> Date: Sat, 27 Jul 2019 19:29:29 +0900 Subject: [PATCH] Hugo Modules (#3) * change: base image debian:9-slim to golang:1.12.7-buster * update: tag on readme --- Dockerfile | 24 ++++++++---------------- README.md | 4 ++-- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4b0ed2f..e447c3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM debian:9-slim +FROM golang:1.12.7-buster -LABEL "com.github.actions.name"="Hugo extended action" -LABEL "com.github.actions.description"="GitHub Actions for Hugo extended version" +LABEL "com.github.actions.name"="Hugo action" +LABEL "com.github.actions.description"="GitHub Actions for Hugo extended and Hugo Modules" LABEL "com.github.actions.icon"="package" LABEL "com.github.actions.color"="yellow" @@ -10,18 +10,10 @@ LABEL "homepage"="https://github.com/peaceiris/actions-hugo" LABEL "maintainer"="peaceiris" ENV HUGO_VERSION='0.56.0' -ENV HUGO_NAME="hugo_extended_${HUGO_VERSION}_Linux-64bit" -ENV HUGO_URL="https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/${HUGO_NAME}.deb" -ENV BUILD_DEPS="wget ca-certificates" +ENV HUGO_URL='https://github.com/gohugoio/hugo.git' -RUN apt-get update && \ - apt-get install -y --no-install-recommends git ${BUILD_DEPS} && \ - wget "${HUGO_URL}" && \ - apt-get install -y --no-install-recommends "./${HUGO_NAME}.deb" && \ - rm -rf "./${HUGO_NAME}.deb" "${HUGO_NAME}" && \ - apt-get remove -y ${BUILD_DEPS} && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* +RUN git clone ${HUGO_URL} -b v${HUGO_VERSION} --depth 1 /hugo && \ + cd /hugo && \ + go install --tags extended -ENTRYPOINT [ "/usr/local/bin/hugo" ] +ENTRYPOINT [ "/go/bin/hugo" ] diff --git a/README.md b/README.md index 746ba40..f430408 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ -## GitHub Actions for Hugo extended +## GitHub Actions for Hugo extended and Modules - [gohugoio/hugo: The world’s fastest framework for building websites.](https://github.com/gohugoio/hugo) @@ -36,7 +36,7 @@ action "is-branch-master" { action "build" { needs = "is-branch-master" - uses = "peaceiris/actions-hugo@v0.56.0" + uses = "peaceiris/actions-hugo@v0.56.0-mod" args = ["--gc", "--minify", "--cleanDestinationDir"] }