Compare commits

...

65 Commits

Author SHA1 Message Date
surtur b30c28cfec
readme: deprecate 'docker build' badge [skip ci] 2022-10-10 15:04:13 +02:00
surtur e397b0a56e
chore: bump hugo to version 0.104.3
All checks were successful
continuous-integration/drone/push Build is passing
2022-10-10 14:59:12 +02:00
surtur a6529adbd5
ci: start signing .drone.yml
All checks were successful
continuous-integration/drone/push Build is passing
2022-09-08 14:19:13 +02:00
surtur e1418c5118
makefile: bump kaniko to v1.9.0-debug
All checks were successful
continuous-integration/drone/push Build is passing
2022-08-19 21:28:04 +02:00
surtur e70895d4c8
bump docker frontend to v1.4
All checks were successful
continuous-integration/drone/push Build is passing
2022-08-19 21:27:43 +02:00
surtur 778690356b
chore: bump hugo to version 0.101.0
All checks were successful
continuous-integration/drone/push Build is passing
2022-06-17 15:54:05 +02:00
surtur 003d2d113d
chore: bump hugo to version 0.100.2
All checks were successful
continuous-integration/drone/push Build is passing
2022-06-10 14:42:29 +02:00
surtur adc2d69a87
chore: bump hugo to version 0.99.1
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-20 15:53:43 +02:00
surtur c9a1f28f84
chore: bump hugo to version 0.99.0
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-16 16:12:07 +02:00
surtur fa65815fa4
bump fedora to version 36
All checks were successful
continuous-integration/drone/push Build is passing
Squashed commit of the following:

commit ffb6996208
Author: surtur <a_mirre@utb.cz>
Date:   Wed Apr 20 16:47:28 2022 +0200

    bump fedora to version 36
2022-05-16 16:02:21 +02:00
surtur bb6fc9aeda
rm curl.it legacy script
All checks were successful
continuous-integration/drone/push Build is passing
2022-04-28 14:13:05 +02:00
surtur 6b4e913f6f
chore: bump hugo to version 0.98.0
All checks were successful
continuous-integration/drone/push Build is passing
2022-04-28 14:05:50 +02:00
surtur a197095772
makefile: bump kaniko executor to v1.8.1-debug
[skip ci]
2022-04-28 14:04:41 +02:00
surtur 6d63a9abc4
makefile: fix kaniko on SELinux-enabled systems
[skip ci]
2022-04-28 14:02:30 +02:00
surtur afc4b7ae0f
rename: Dockerfile --> Containerfile
All checks were successful
continuous-integration/drone/push Build is passing
keep Dockerfile as a symlink for backwards compatibility
2022-04-20 16:40:33 +02:00
surtur 95a6e4e40f
chore: bump hugo to version 0.97.3
All checks were successful
continuous-integration/drone/push Build is passing
2022-04-20 13:25:33 +02:00
surtur 1d94edb3f4
chore: bump hugo to version 0.97.1
All checks were successful
continuous-integration/drone/push Build is passing
2022-04-17 00:03:39 +02:00
surtur 25f0f01e58
dockerfile: consolidate multiple RUN statements
All checks were successful
continuous-integration/drone/push Build is passing
2022-03-26 15:11:40 +01:00
surtur 8704e0f723
ci: bump hadolint to v2.9.3-alpine
All checks were successful
continuous-integration/drone/push Build is passing
2022-03-26 15:03:28 +01:00
surtur 5397b679aa
makefile: bump kaniko executor to v1.8.0-debug
All checks were successful
continuous-integration/drone/push Build is passing
2022-03-26 14:37:57 +01:00
surtur fbf19094fc
chore: bump hugo to version 0.96.0
All checks were successful
continuous-integration/drone/push Build is passing
2022-03-26 14:33:26 +01:00
surtur e0423422ce
chore: bump hugo to version 0.95.0
All checks were successful
continuous-integration/drone/push Build is passing
2022-03-20 20:45:20 +01:00
surtur 3a84a16b16
chore: bump hugo to version 0.94.2
All checks were successful
continuous-integration/drone/push Build is passing
2022-03-20 20:43:17 +01:00
surtur 6008557b03
chore: bump hugo to version 0.94.1
All checks were successful
continuous-integration/drone/push Build is passing
2022-03-20 20:40:23 +01:00
surtur aae30eda9a
chore: bump hugo to version 0.94.0
All checks were successful
continuous-integration/drone/push Build is passing
2022-03-20 20:40:00 +01:00
surtur 8b7f618e8a
chore: bump hugo to version 0.93.3
All checks were successful
continuous-integration/drone/push Build is passing
2022-03-08 17:25:49 +01:00
surtur 274487a0a3
chore: bump hugo to version 0.93.1
All checks were successful
continuous-integration/drone/push Build is passing
2022-03-03 14:15:18 +01:00
surtur 5776511727
chore: bump hugo to version 0.93.0
All checks were successful
continuous-integration/drone/push Build is passing
2022-03-03 13:50:12 +01:00
surtur 418359e0aa
chore: bump hugo to version 0.92.2
All checks were successful
continuous-integration/drone/push Build is passing
2022-02-14 16:47:38 +01:00
surtur 164f7592b1
chore: bump hugo to version 0.92.0
All checks were successful
continuous-integration/drone/push Build is passing
2022-01-15 01:16:08 +01:00
surtur 24bf30070c
chore: bump hugo to version 0.91.2
All checks were successful
continuous-integration/drone/push Build is passing
2021-12-28 23:29:45 +01:00
surtur 4619ac14fc
chore: bump hugo version to 0.91.0
All checks were successful
continuous-integration/drone/push Build is passing
2021-12-18 15:49:30 +01:00
surtur 4d86e83ed5
chore: bump hugo version to 0.90.1
All checks were successful
continuous-integration/drone/push Build is passing
2021-12-11 14:59:26 +01:00
surtur 01d3ede7f6
chore: bump hugo to version 0.89.4
All checks were successful
continuous-integration/drone/push Build is passing
2021-11-17 18:33:25 +01:00
surtur 61b3428e51
ci: bump hadolint to v2.8.0
All checks were successful
continuous-integration/drone/push Build is passing
2021-11-16 23:03:12 +01:00
surtur b4645909c9
chore: bump hugo to version 0.89.3
All checks were successful
continuous-integration/drone/push Build is passing
2021-11-16 22:57:47 +01:00
surtur bf86f52b20
chore: bump hugo to version 0.89.2
All checks were successful
continuous-integration/drone/push Build is passing
2021-11-08 23:32:11 +01:00
surtur e5db3bee7e
bump fedora to version 35
All checks were successful
continuous-integration/drone/push Build is passing
2021-11-03 03:16:22 +01:00
surtur aa467ae0b5
silence the loud voice of find errors
All checks were successful
continuous-integration/drone/push Build is passing
2021-11-03 03:02:42 +01:00
surtur 3f794fbd27
chore: bump hugo to version 0.89.0
All checks were successful
continuous-integration/drone/push Build is passing
2021-11-03 02:04:25 +01:00
surtur 50e47388e5
add docker frontend
All checks were successful
continuous-integration/drone/push Build is passing
2021-10-21 01:25:50 +02:00
surtur af99fa3f7c
fix(kaniko): supply build args {in ci,locally}
All checks were successful
continuous-integration/drone/push Build is passing
2021-10-21 01:12:20 +02:00
surtur 8c2b65c4cd
chore(makefile): bump kaniko to 1.7.0
All checks were successful
continuous-integration/drone/push Build is passing
no need to force as this version of kaniko is already capable of
detecting container engine on cgroupsv2 hosts
2021-10-21 01:08:57 +02:00
surtur 998ae2bb4d
chore: bump hugo version to 0.88.1
All checks were successful
continuous-integration/drone/push Build is passing
2021-09-04 23:48:39 +02:00
surtur cf031239fd
chore: bump hugo version to 0.88.0
All checks were successful
continuous-integration/drone/push Build is passing
2021-09-03 19:32:34 +02:00
wanderer 59b9413fb4
ci: bump hadolint to v2.7.0 (#5)
All checks were successful
continuous-integration/drone/push Build is passing
bump hadolint in ci from v2.6.0 to v2.7.0

close #4
pertinent info - v2.6.1 container image has not been properly built and released.

ref: https://github.com/hadolint/hadolint/issues/687

Reviewed-on: #5
Co-authored-by: wanderer <wanderer@noreply.git.dotya.ml>
Co-committed-by: wanderer <wanderer@noreply.git.dotya.ml>
2021-08-30 23:09:58 +02:00
surtur ad7270cdd4
chore: bump hugo version to 0.87.0
All checks were successful
continuous-integration/drone/push Build is passing
2021-08-06 16:19:27 +02:00
wanderer f737be21ab
ci: bump hadolint from 1.23.0-8-gb01c5a9 to 2.6.0 (#3)
All checks were successful
continuous-integration/drone/push Build is passing
bump hadolint in drone from 1.23.0-8-gb01c5a9 to 2.6.0.

* 3f71770 hadolint: ad DL3059 <surtur>
* fa5c787 hadolint: bump to tag v2.6.0-alpine <surtur>

Reviewed-on: #3
2021-07-30 23:01:44 +02:00
surtur 639354d336
chore: bump hugo version to 0.86.1
All checks were successful
continuous-integration/drone/push Build is passing
2021-07-30 22:18:50 +02:00
surtur 2ed8bfdba3
chore: bump hugo version to 0.86.0
All checks were successful
continuous-integration/drone/push Build is passing
2021-07-21 21:25:11 +02:00
surtur 3cd896c8e4
readme: microbadger is no more [skip ci] 2021-07-16 13:21:56 +02:00
surtur 5f3080465d
chore: bump hugo version to 0.85.0
All checks were successful
continuous-integration/drone/push Build is passing
2021-07-05 14:51:58 +02:00
surtur 709ce96237
chore: bump hugo to version 0.84.2
All checks were successful
continuous-integration/drone/push Build is passing
2021-06-29 23:21:39 +02:00
surtur 453dce6ef7
chore: bump hugo version to 0.84.0
All checks were successful
continuous-integration/drone/push Build is passing
2021-06-19 20:55:42 +02:00
surtur adaa2a4609
chore: update README badges [skip ci] 2021-05-05 03:38:06 +02:00
surtur bb7c059c97
chore: bump hugo version to 0.83.1
All checks were successful
continuous-integration/drone/push Build is passing
2021-05-02 21:08:57 +02:00
surtur 173b86847f
ci: use linux-amd64 stable tag
All checks were successful
continuous-integration/drone/push Build is passing
the tag's also moving but efforts are made to only push working code
there so it should do in terms of stability
2021-05-02 03:55:32 +02:00
surtur 48bdc31820
chore: bump hugo version to 0.83.0
All checks were successful
continuous-integration/drone/push Build is passing
2021-05-02 00:22:02 +02:00
surtur c20a8634b4
ci: directly run kaniko-publish step on master
All checks were successful
continuous-integration/drone/push Build is passing
There's no need to run both kaniko-build and kaniko-publish step when on
master, instead, after hadolint, go directly to kaniko-publish.
This way, kaniko-build is only run for PRs, tags or feature branch builds
2021-04-22 13:12:49 +02:00
surtur 41553cbe1c
ci: introduce hadolint Dockerfile linting
All checks were successful
continuous-integration/drone/push Build is passing
2021-04-21 23:09:43 +02:00
surtur f84c016be7
dockerfile: switch to fedora-minimal
All checks were successful
continuous-integration/drone/push Build is passing
* source the image from fedoraproject's container repository
* edit Dockerfile to use microdnf as dnf is unavailable in -minimal
  images
* instruct microdnf to not install weak deps or docs
* update image info in README.md
2021-04-21 23:03:41 +02:00
surtur c4921033f9
chore: correct container metadata label [skip ci] 2021-04-21 22:51:57 +02:00
surtur d728f4cd60
makefile: fix for kaniko on cgroup v2 hosts
This is a temporary workaround that enables kaniko to run on cgroup v2
enabled hosts. Due to an upstream issue, kaniko fails to detect that it
is indeed being run from a container.
Solution introduced here is to force kaniko to run regardless.

ref: https://github.com/GoogleContainerTools/kaniko/issues/1592

[skip ci]
2021-04-21 22:47:37 +02:00
surtur 9ef9a9bc33
ci: add reworked push logic; use own kaniko image
All checks were successful
continuous-integration/drone/push Build is passing
2021-04-21 05:06:10 +02:00
surtur 76f606e4e1
chore: bump hugo version to 0.82.1
Some checks reported errors
continuous-integration/drone/push Build was killed
2021-04-20 14:58:54 +02:00
6 changed files with 109 additions and 78 deletions

View File

@ -1,47 +1,71 @@
---
kind: pipeline
type: docker
name: dockerhub-build-trigger
name: testing
platform:
os: linux
arch: amd64
clone:
disable: true
steps:
- name: call webhook
- name: hadolint
pull: always
image: bash:latest
environment:
ENDPOINT:
from_secret: dockerhub_endpoint
image: hadolint/hadolint:v2.9.3-alpine
commands:
- apk add --no-cache curl
- curl -sO https://git.dotya.ml/wanderer/docker-fedora-hugo/raw/branch/master/curl.it
- bash ./curl.it $ENDPOINT
- hadolint --version
- hadolint Containerfile
when:
ref:
- refs/heads/master
- "refs/heads/feature-**"
- "refs/pull/**"
- "refs/tags/**"
event:
exclude: [cron]
- name: kaniko-build
pull: always
image: immawanderer/drone-kaniko:linux-amd64
settings:
dockerfile: Containerfile
context: .
args:
- BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
- VCS_REF=${DRONE_COMMIT_SHA:0:7}
when:
ref:
- "refs/heads/feature-**"
- "refs/pull/**"
- "refs/tags/**"
event:
exclude: [cron]
- name: kaniko-publish
pull: always
image: immawanderer/drone-kaniko:linux-amd64
settings:
dockerfile: Containerfile
context: .
args:
- BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
- VCS_REF=${DRONE_COMMIT_SHA:0:7}
tags:
- latest
- linux-amd64
- ${DRONE_COMMIT_SHA:0:8}
repo: immawanderer/fedora-hugo
username:
from_secret: docker_username
password:
from_secret: docker_password
when:
ref:
- refs/heads/master
event:
exclude: [pull_request, tag]
trigger:
branch: [master]
event: [push, cron]
---
kind: pipeline
type: docker
name: kaniko-build
platform:
os: linux
arch: amd64
steps:
- name: build
pull: always
image: ghcr.io/finitum/drone-kaniko:0.8.2
settings:
dockerfile: Dockerfile
context: .
event: [push, pull_request, cron, tag]
---
kind: pipeline
@ -85,7 +109,7 @@ trigger:
- failure
depends_on:
- kaniko-build
- testing
---
kind: pipeline
@ -131,4 +155,10 @@ trigger:
- failure
depends_on:
- kaniko-build
- testing
---
kind: signature
hmac: f43c4763b72fa76b3c12b03aa32f9a36f22ebb3a90d546388bd625ba6d3efe01
...

33
Containerfile Normal file
View File

@ -0,0 +1,33 @@
# syntax=docker/dockerfile:1.4
FROM registry.fedoraproject.org/fedora-minimal:36
ENV HUGO_VERSION 0.104.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 /

View File

@ -1,29 +0,0 @@
FROM fedora:34
ENV HUGO_VERSION 0.82.0
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-archlinux-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/
RUN dnf --refresh upgrade -y && dnf install -y git findutils
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 -rfv /tmp/*
RUN dnf autoremove -y -x findutils \
&& dnf clean all -y
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 /

1
Dockerfile Symbolic link
View File

@ -0,0 +1 @@
Containerfile

View File

@ -1,14 +1,16 @@
dcmd = docker
dfile = Dockerfile
dfile = Containerfile
dtag = immawanderer/fedora-hugo:testbuild
dargs = build -t $(dtag) --no-cache --pull - < $(dfile)
cleanargs = image rm -f $(dtag)
pruneargs = system prune -af
dargskaniko = run --rm -it -w=$(kanikowdir) -v $$PWD:$(kanikowdir)
kanikoexecutorimg = gcr.io/kaniko-project/executor
dargskaniko = run --rm -it -w=$(kanikowdir) -v $$PWD:$(kanikowdir):z
kanikoexecutorimg = gcr.io/kaniko-project/executor:v1.9.0-debug
kanikowdir = /src
kanikocontext = .
kanikoargs = -f=$(dfile) -c=$(kanikocontext) --use-new-run --snapshotMode=redo --no-push
kanikoargs = -f=$(dfile) -c=$(kanikocontext) --use-new-run --snapshotMode=redo --build-arg BUILD_DATE=$(build_date) --build-arg VCS_REF=$(vcs_ref) --no-push
vcs_ref = $$(git rev-parse --short HEAD)
build_date= $$(date -u +"%Y-%m-%dT%H:%M:%SZ")
.PHONY: build kaniko clean test prune

View File

@ -1,11 +1,12 @@
# docker-fedora-hugo
[![Build Status](https://drone.dotya.ml/api/badges/wanderer/docker-fedora-hugo/status.svg)](https://drone.dotya.ml/wanderer/docker-fedora-hugo)
[![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/immawanderer/fedora-hugo)](https://hub.docker.com/r/immawanderer/fedora-hugo/builds)
[![](https://images.microbadger.com/badges/version/immawanderer/archlinux.svg)](https://microbadger.com/images/immawanderer/fedora-hugo)
[![](https://images.microbadger.com/badges/commit/immawanderer/archlinux.svg)](https://microbadger.com/images/immawanderer/fedora-hugo)
[![Docker Image Version (latest by date)](https://img.shields.io/docker/v/immawanderer/fedora-hugo)](https://hub.docker.com/r/immawanderer/fedora-hugo/tags/?page=1&ordering=last_updated)
[![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/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/)
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.
@ -13,7 +14,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)
## What you get
* updated `fedora:33` image
* updated `registry.fedoraproject.org/fedora-minimal:36` image
* git
* hugo-extended (latest version from [GitHub](https://github.com/gohugoio/hugo/releases))

View File

@ -1,7 +0,0 @@
#!/bin/bash
if [ $# -gt 1 ]; then
curl -s -H 'Content-Type: application/json' --data '{"docker_tag":"nightly"}' -X POST $2
else
curl -s -H 'Content-Type: application/json' --data '{"docker_tag":"latest"}' -X POST $1
fi