Skip to content
This repository was archived by the owner on Oct 7, 2025. It is now read-only.

Commit 8aca7ef

Browse files
tiredofittiredofit
committed
Release 2.4.4 - See CHANGELOG.md
1 parent 4b230d4 commit 8aca7ef

File tree

9 files changed

+240
-147
lines changed

9 files changed

+240
-147
lines changed

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
examples/

‎.github/config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false

‎.github/dependabot.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
# Maintain dependencies for GitHub Actions
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "daily"

‎.github/workflows/main.yml‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
### Application Level Image CI
2+
### Dave Conroy <dave at tiredofit dot ca>
3+
4+
name: 'build'
5+
6+
on:
7+
push:
8+
paths:
9+
- '**'
10+
- '!README.md'
11+
jobs:
12+
docker:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v3
17+
18+
- name: Prepare
19+
id: prep
20+
run: |
21+
DOCKER_IMAGE=${GITHUB_REPOSITORY/docker-/}
22+
set -x
23+
if [[ $GITHUB_REF == refs/heads/* ]]; then
24+
if [[ $GITHUB_REF == refs/heads/*/* ]] ; then
25+
BRANCH="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")"
26+
else
27+
BRANCH=${GITHUB_REF#refs/heads/}
28+
fi
29+
30+
case ${BRANCH} in
31+
"main" | "master" )
32+
BRANCHTAG="${DOCKER_IMAGE}:latest"
33+
;;
34+
"develop" )
35+
BRANCHTAG="${DOCKER_IMAGE}:develop"
36+
;;
37+
* )
38+
if [ -n "${{ secrets.LATEST }}" ] ; then
39+
if [ "${BRANCHTAG}" = "${{ secrets.LATEST }}" ]; then
40+
BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest,${DOCKER_IMAGE}:latest"
41+
else
42+
BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest"
43+
fi
44+
else
45+
BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest"
46+
fi
47+
;;
48+
esac
49+
fi
50+
51+
52+
if [[ $GITHUB_REF == refs/tags/* ]]; then
53+
GITTAG="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed 's|refs/tags/||g')"
54+
fi
55+
56+
if [ -n "${BRANCHTAG}" ] && [ -n "${GITTAG}" ]; then
57+
TAGS=${BRANCHTAG},${GITTAG}
58+
else
59+
TAGS="${BRANCHTAG}${GITTAG}"
60+
fi
61+
62+
echo ::set-output name=tags::${TAGS}
63+
echo ::set-output name=docker_image::${DOCKER_IMAGE}
64+
65+
- name: Set up QEMU
66+
uses: docker/setup-qemu-action@v2
67+
with:
68+
platforms: all
69+
70+
- name: Set up Docker Buildx
71+
id: buildx
72+
uses: docker/setup-buildx-action@v2
73+
74+
- name: Login to DockerHub
75+
if: github.event_name != 'pull_request'
76+
uses: docker/login-action@v2
77+
with:
78+
username: ${{ secrets.DOCKER_USERNAME }}
79+
password: ${{ secrets.DOCKER_PASSWORD }}
80+
81+
- name: Label
82+
id: Label
83+
run: |
84+
if [ -f "Dockerfile" ] ; then
85+
sed -i "/FROM .*/a LABEL tiredofit.image.git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" Dockerfile
86+
sed -i "/FROM .*/a LABEL tiredofit.image.git_commit=\"${GITHUB_SHA}\"" Dockerfile
87+
sed -i "/FROM .*/a LABEL tiredofit.image.git_committed_by=\"${GITHUB_ACTOR}\"" Dockerfile
88+
sed -i "/FROM .*/a LABEL tiredofit.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" Dockerfile
89+
if [ -f "CHANGELOG.md" ] ; then
90+
sed -i "/FROM .*/a LABEL tiredofit.image.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" Dockerfile
91+
mkdir -p install/assets/.changelogs ; cp CHANGELOG.md install/assets/.changelogs/${GITHUB_REPOSITORY/\//_}.md
92+
fi
93+
94+
if [[ $GITHUB_REF == refs/tags/* ]]; then
95+
sed -i "/FROM .*/a LABEL tiredofit.image.git_tag=\"${GITHUB_REF#refs/tags/v}\"" Dockerfile
96+
fi
97+
98+
if [[ $GITHUB_REF == refs/heads/* ]]; then
99+
sed -i "/FROM .*/a LABEL tiredofit.image.git_branch=\"${GITHUB_REF#refs/heads/}\"" Dockerfile
100+
fi
101+
fi
102+
103+
- name: Build
104+
uses: docker/build-push-action@v3
105+
with:
106+
builder: ${{ steps.buildx.outputs.name }}
107+
context: .
108+
file: ./Dockerfile
109+
platforms: linux/amd64
110+
push: true
111+
tags: ${{ steps.prep.outputs.tags }}

‎.github/workflows/manual.yml‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
# Manual Workflow (Application)
2+
3+
name: manual
4+
5+
on:
6+
workflow_dispatch:
7+
inputs:
8+
Manual Build:
9+
description: 'Manual Build'
10+
required: false
11+
jobs:
12+
docker:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v3
17+
18+
- name: Prepare
19+
id: prep
20+
run: |
21+
DOCKER_IMAGE=${GITHUB_REPOSITORY/docker-/}
22+
set -x
23+
if [[ $GITHUB_REF == refs/heads/* ]]; then
24+
if [[ $GITHUB_REF == refs/heads/*/* ]] ; then
25+
BRANCH="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")"
26+
else
27+
BRANCH=${GITHUB_REF#refs/heads/}
28+
fi
29+
30+
case ${BRANCH} in
31+
"main" | "master" )
32+
BRANCHTAG="${DOCKER_IMAGE}:latest"
33+
;;
34+
"develop" )
35+
BRANCHTAG="${DOCKER_IMAGE}:develop"
36+
;;
37+
* )
38+
if [ -n "${{ secrets.LATEST }}" ] ; then
39+
if [ "${BRANCHTAG}" = "${{ secrets.LATEST }}" ]; then
40+
BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest,${DOCKER_IMAGE}:latest"
41+
else
42+
BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest"
43+
fi
44+
else
45+
BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest"
46+
fi
47+
;;
48+
esac
49+
fi
50+
51+
52+
if [[ $GITHUB_REF == refs/tags/* ]]; then
53+
GITTAG="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed 's|refs/tags/||g')"
54+
fi
55+
56+
if [ -n "${BRANCHTAG}" ] && [ -n "${GITTAG}" ]; then
57+
TAGS=${BRANCHTAG},${GITTAG}
58+
else
59+
TAGS="${BRANCHTAG}${GITTAG}"
60+
fi
61+
62+
echo ::set-output name=tags::${TAGS}
63+
echo ::set-output name=docker_image::${DOCKER_IMAGE}
64+
65+
- name: Set up QEMU
66+
uses: docker/setup-qemu-action@v2
67+
with:
68+
platforms: all
69+
70+
- name: Set up Docker Buildx
71+
id: buildx
72+
uses: docker/setup-buildx-action@v2
73+
74+
- name: Login to DockerHub
75+
if: github.event_name != 'pull_request'
76+
uses: docker/login-action@v2
77+
with:
78+
username: ${{ secrets.DOCKER_USERNAME }}
79+
password: ${{ secrets.DOCKER_PASSWORD }}
80+
81+
- name: Label
82+
id: Label
83+
run: |
84+
if [ -f "Dockerfile" ] ; then
85+
sed -i "/FROM .*/a LABEL tiredofit.image.git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" Dockerfile
86+
sed -i "/FROM .*/a LABEL tiredofit.image.git_commit=\"${GITHUB_SHA}\"" Dockerfile
87+
sed -i "/FROM .*/a LABEL tiredofit.image.git_committed_by=\"${GITHUB_ACTOR}\"" Dockerfile
88+
sed -i "/FROM .*/a LABEL tiredofit.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" Dockerfile
89+
if [ -f "CHANGELOG.md" ] ; then
90+
sed -i "/FROM .*/a LABEL tiredofit.image.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" Dockerfile
91+
mkdir -p install/assets/.changelogs ; cp CHANGELOG.md install/assets/.changelogs/${GITHUB_REPOSITORY/\//_}.md
92+
fi
93+
94+
if [[ $GITHUB_REF == refs/tags/* ]]; then
95+
sed -i "/FROM .*/a LABEL tiredofit.image.git_tag=\"${GITHUB_REF#refs/tags/v}\"" Dockerfile
96+
fi
97+
98+
if [[ $GITHUB_REF == refs/heads/* ]]; then
99+
sed -i "/FROM .*/a LABEL tiredofit.image.git_branch=\"${GITHUB_REF#refs/heads/}\"" Dockerfile
100+
fi
101+
fi
102+
103+
- name: Build
104+
uses: docker/build-push-action@v3
105+
with:
106+
builder: ${{ steps.buildx.outputs.name }}
107+
context: .
108+
file: ./Dockerfile
109+
platforms: linux/amd64
110+
push: true
111+
tags: ${{ steps.prep.outputs.tags }}

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 2.4.4 2022-08-06 <dave at tiredofit dot ca>
2+
3+
### Added
4+
- Start using custom_scripts and custom_files functions from base
5+
6+
17
## 2.4.3 2022-05-05 <dddpaul at google dot com>
28

39
### Changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The following image tags are available along with their tagged release based on
6262
| latest | Debian | `:latest` |
6363

6464
#### Multi Architecture
65-
Images are built primarily for `amd64` architecture, and may also include builds for `arm/v6`, `arm/v7`, `arm64` and others. These variants are all unsupported. Consider [sponsoring](https://github.com/sponsors/tiredofit) my work so that I can work with various hardware. To see if this image supports multiple architecures, type `docker manifest (image):(tag)`
65+
Images are built primarily for `amd64` architecture, and may also include builds for `arm/v7`, `arm64` and others. These variants are all unsupported. Consider [sponsoring](https://github.com/sponsors/tiredofit) my work so that I can work with various hardware. To see if this image supports multiple architecures, type `docker manifest (image):(tag)`
6666

6767
## Configuration
6868

‎install/etc/cont-init.d/02-permissions‎

Lines changed: 0 additions & 138 deletions
This file was deleted.

0 commit comments

Comments
 (0)