bump fedora version to 34 #2

Merged
wanderer merged 2 commits from f34 into master 2021-04-01 12:46:58 +02:00
2 changed files with 8 additions and 6 deletions

@ -22,6 +22,10 @@ steps:
- curl -sO https://git.dotya.ml/wanderer/docker-fedora-hugo/raw/branch/master/curl.it - curl -sO https://git.dotya.ml/wanderer/docker-fedora-hugo/raw/branch/master/curl.it
- bash ./curl.it $ENDPOINT - bash ./curl.it $ENDPOINT
trigger:
branch: [master]
event: [push, cron]
--- ---
kind: pipeline kind: pipeline
type: docker type: docker
@ -73,8 +77,6 @@ steps:
from_secret: discord_webhook_token from_secret: discord_webhook_token
trigger: trigger:
branch:
- master
event: event:
exclude: [pull_request] exclude: [pull_request]
include: [push, tag] include: [push, tag]

@ -1,4 +1,4 @@
FROM fedora:33 FROM fedora:34
ENV HUGO_VERSION 0.82.0 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/ WORKDIR /tmp/
RUN dnf --refresh upgrade -y && dnf install -y git findutils 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 \ && chmod +x /tmp/hugo \
&& mkdir -pv /usr/local/bin \ && mkdir -pv /usr/local/bin \
&& mv -v /tmp/hugo /usr/local/bin/ \ && mv -v /tmp/hugo /usr/local/bin/ \
&& rm -rv /tmp/* && rm -rfv /tmp/*
RUN dnf autoremove -y -x findutils \ RUN dnf autoremove -y -x findutils \
&& dnf clean all -y && 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 /. -name "*~" -type f -delete; \
find /usr/share/terminfo/. ! -name "*xterm*" ! -name "*screen*" ! -name "*screen*" -type f -delete find /usr/share/terminfo/. ! -name "*xterm*" ! -name "*screen*" ! -name "*screen*" -type f -delete
WORKDIR / WORKDIR /