rename: Dockerfile --> Containerfile
All checks were successful
continuous-integration/drone/push Build is passing

keep Dockerfile as a symlink for backwards compatibility
This commit is contained in:
surtur 2022-04-20 16:29:25 +02:00
parent 95a6e4e40f
commit afc4b7ae0f
Signed by: wanderer
GPG Key ID: 19CE1EC1D9E0486D
5 changed files with 39 additions and 38 deletions

@ -13,7 +13,7 @@ steps:
image: hadolint/hadolint:v2.9.3-alpine image: hadolint/hadolint:v2.9.3-alpine
commands: commands:
- hadolint --version - hadolint --version
- hadolint Dockerfile - hadolint Containerfile
when: when:
ref: ref:
- refs/heads/master - refs/heads/master
@ -27,7 +27,7 @@ steps:
pull: always pull: always
image: immawanderer/drone-kaniko:linux-amd64 image: immawanderer/drone-kaniko:linux-amd64
settings: settings:
dockerfile: Dockerfile dockerfile: Containerfile
context: . context: .
args: args:
- BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" - BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
@ -44,7 +44,7 @@ steps:
pull: always pull: always
image: immawanderer/drone-kaniko:linux-amd64 image: immawanderer/drone-kaniko:linux-amd64
settings: settings:
dockerfile: Dockerfile dockerfile: Containerfile
context: . context: .
args: args:
- BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" - BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"

33
Containerfile Normal file

@ -0,0 +1,33 @@
# syntax=docker/dockerfile:1.3
FROM registry.fedoraproject.org/fedora-minimal:35
ENV HUGO_VERSION 0.97.3
ARG BUILD_DATE
ARG VCS_REF
LABEL description="Container image for building websites with Hugo static site generator."
LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vcs-url="https://git.dotya.ml/wanderer/docker-fedora-hugo.git" \
org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.license=GPL-3.0
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/
# DL3041 warning: Specify version with `dnf install -y <package>-<version>`.
# hadolint ignore=DL3041
RUN microdnf --refresh upgrade -y && microdnf install -y bsdtar git findutils \
--nodocs --setopt install_weak_deps=0 \
&& microdnf clean all -y; \
\
bsdtar 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 -rfv /tmp/* \
&& rm -rf /usr/share/zoneinfo/* ; rm -rf /usr/include/* ; \
find /. -name "*~" -type f -delete > /dev/null 2>&1 ;\
find /usr/share/terminfo/. ! -name "*xterm*" ! -name "*screen*" ! -name "*screen*" -type f -delete
WORKDIR /

@ -1,33 +0,0 @@
# syntax=docker/dockerfile:1.3
FROM registry.fedoraproject.org/fedora-minimal:35
ENV HUGO_VERSION 0.97.3
ARG BUILD_DATE
ARG VCS_REF
LABEL description="Docker image for building websites with Hugo static site generator."
LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vcs-url="https://git.dotya.ml/wanderer/docker-fedora-hugo.git" \
org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.license=GPL-3.0
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/
# DL3041 warning: Specify version with `dnf install -y <package>-<version>`.
# hadolint ignore=DL3041
RUN microdnf --refresh upgrade -y && microdnf install -y bsdtar git findutils \
--nodocs --setopt install_weak_deps=0 \
&& microdnf clean all -y; \
\
bsdtar 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 -rfv /tmp/* \
&& rm -rf /usr/share/zoneinfo/* ; rm -rf /usr/include/* ; \
find /. -name "*~" -type f -delete > /dev/null 2>&1 ;\
find /usr/share/terminfo/. ! -name "*xterm*" ! -name "*screen*" ! -name "*screen*" -type f -delete
WORKDIR /

1
Dockerfile Symbolic link

@ -0,0 +1 @@
Containerfile

@ -1,5 +1,5 @@
dcmd = docker dcmd = docker
dfile = Dockerfile dfile = Containerfile
dtag = immawanderer/fedora-hugo:testbuild dtag = immawanderer/fedora-hugo:testbuild
dargs = build -t $(dtag) --no-cache --pull - < $(dfile) dargs = build -t $(dtag) --no-cache --pull - < $(dfile)
cleanargs = image rm -f $(dtag) cleanargs = image rm -f $(dtag)

@ -7,7 +7,7 @@
[![Docker Image Size (tag)](https://img.shields.io/docker/image-size/immawanderer/fedora-hugo/linux-amd64)](https://hub.docker.com/r/immawanderer/fedora-hugo/tags/?page=1&ordering=last_updated&name=linux-amd64) [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/immawanderer/fedora-hugo/linux-amd64)](https://hub.docker.com/r/immawanderer/fedora-hugo/tags/?page=1&ordering=last_updated&name=linux-amd64)
[![Docker pulls](https://img.shields.io/docker/pulls/immawanderer/fedora-hugo)](https://hub.docker.com/r/immawanderer/fedora-hugo/) [![Docker pulls](https://img.shields.io/docker/pulls/immawanderer/fedora-hugo)](https://hub.docker.com/r/immawanderer/fedora-hugo/)
This repository provides the Dockerfile to create a Docker image used for web developent using [Hugo](https://gohugo.io) website building framework. This repository provides a Containerfile to create a container image, which may be used for web developent using [Hugo](https://gohugo.io) website building framework.
The image is rebuilt <del>approximately every hour</del> nightly to ensure it always has the latest packages. The image is rebuilt <del>approximately every hour</del> nightly to ensure it always has the latest packages.