feat: bump base image fedora version to 33
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing

* plus some Dockerfile refactoring
This commit is contained in:
surtur 2020-10-15 01:56:02 +02:00
parent c6b58d5483
commit 32ba351c35
Signed by: wanderer
GPG Key ID: 19CE1EC1D9E0486D
2 changed files with 6 additions and 6 deletions

View File

@ -1,4 +1,4 @@
FROM fedora:32 FROM fedora:33
ENV HUGO_VERSION 0.76.5 ENV HUGO_VERSION 0.76.5
@ -15,15 +15,15 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
ADD https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz /tmp/hugo.tar.gz ADD https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz /tmp/hugo.tar.gz
WORKDIR /tmp/ WORKDIR /tmp/
RUN dnf --refresh upgrade -y && dnf install -y git && dnf autoremove -y RUN dnf --refresh upgrade -y && dnf install -y git findutils && dnf autoremove -y
RUN tar xfv /tmp/hugo.tar.gz && rm -v /tmp/hugo.tar.gz README.md LICENSE \ RUN tar xfv /tmp/hugo.tar.gz && rm -v /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/
RUN dnf clean all -y \ RUN dnf clean all -y \
&& rm -rv /usr/share/zoneinfo/* ; \ && rm -rv /usr/share/zoneinfo/* ; rm -rv /usr/include/* ; \
rm -rv /usr/share/i18n/* ;rm -rv /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; \
rm -rv /tmp/* || true rm -rv /tmp/* ; \
dnf autoremove -y findutils; dnf clean all -y || true
WORKDIR / WORKDIR /

View File

@ -13,7 +13,7 @@ push mirror lives in [this GitHub repo](https://github.com/wULLSnpAXbWZGYDYyhWTK
development happens on [this Gitea instance](https://git.dotya.ml/wanderer/docker-fedora-hugo) development happens on [this Gitea instance](https://git.dotya.ml/wanderer/docker-fedora-hugo)
## What you get ## What you get
* updated `fedora:32` image * updated `fedora:33` image
* git * git
* hugo-extended (latest version from [GitHub](https://github.com/gohugoio/hugo/releases)) * hugo-extended (latest version from [GitHub](https://github.com/gohugoio/hugo/releases))