From c6bb855b41fa04e05a6d6049a65e01e7db1c6642 Mon Sep 17 00:00:00 2001 From: wanderer Date: Thu, 1 Apr 2021 12:46:57 +0200 Subject: [PATCH] bump fedora version to 34 (#2) f33 --> f34 Reviewed-on: https://git.dotya.ml/wanderer/docker-fedora-hugo/pulls/2 Co-authored-by: wanderer Co-committed-by: wanderer --- .drone.yml | 6 ++++-- Dockerfile | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index e7aeeba..0219be7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,6 +22,10 @@ steps: - curl -sO https://git.dotya.ml/wanderer/docker-fedora-hugo/raw/branch/master/curl.it - bash ./curl.it $ENDPOINT +trigger: + branch: [master] + event: [push, cron] + --- kind: pipeline type: docker @@ -73,8 +77,6 @@ steps: from_secret: discord_webhook_token trigger: - branch: - - master event: exclude: [pull_request] include: [push, tag] diff --git a/Dockerfile b/Dockerfile index a938544..154f74f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:33 +FROM fedora:34 ENV HUGO_VERSION 0.82.0 @@ -16,14 +16,14 @@ ADD https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_ext WORKDIR /tmp/ RUN dnf --refresh upgrade -y && dnf install -y git findutils -RUN tar xfv /tmp/hugo.tar.gz && rm -v /tmp/hugo.tar.gz README.md LICENSE \ +RUN tar xfv /tmp/hugo.tar.gz && rm -fv /tmp/hugo.tar.gz README.md LICENSE \ && chmod +x /tmp/hugo \ && mkdir -pv /usr/local/bin \ && mv -v /tmp/hugo /usr/local/bin/ \ - && rm -rv /tmp/* + && rm -rfv /tmp/* RUN dnf autoremove -y -x findutils \ && dnf clean all -y -RUN rm -r /usr/share/zoneinfo/* ; rm -r /usr/include/* ; \ +RUN rm -rf /usr/share/zoneinfo/* ; rm -rf /usr/include/* ; \ find /. -name "*~" -type f -delete; \ find /usr/share/terminfo/. ! -name "*xterm*" ! -name "*screen*" ! -name "*screen*" -type f -delete WORKDIR /