Skip to content

Commit 48edc6e

Browse files
tiredofittiredofit
committed
Release 6.3.1 - See CHANGELOG.md
1 parent 3918c9c commit 48edc6e

File tree

4 files changed

+11
-250
lines changed

4 files changed

+11
-250
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,10 @@ jobs:
135135
# short-description: ${{ github.event.repository.description }}
136136
# readme-filepath: ./README.md
137137

138-
###
139-
alpine_3-17:
138+
alpine_3-18:
140139
env:
141140
DISTRO: "alpine"
142-
DISTRO_VARIANT: "3.17"
141+
DISTRO_VARIANT: "3.18"
143142
build_file: Dockerfile
144143
runs-on: ubuntu-latest
145144
steps:
@@ -258,128 +257,7 @@ jobs:
258257
# short-description: ${{ github.event.repository.description }}
259258
# readme-filepath: ./README.md
260259

261-
###
262-
alpine_3-16:
263-
env:
264-
DISTRO: "alpine"
265-
DISTRO_VARIANT: "3.16"
266-
build_file: Dockerfile
267-
runs-on: ubuntu-latest
268-
steps:
269-
- name: Checkout
270-
uses: actions/checkout@v3
271-
272-
- name: Prepare
273-
id: prep
274-
run: |
275-
if [[ "${GITHUB_REF}" == refs/heads/* ]]; then
276-
if [[ "${GITHUB_REF}" == refs/heads/*/* ]] ; then
277-
git_branch="${GITHUB_REPOSITORY/docker-/}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")"
278-
else
279-
git_branch=${GITHUB_REF#refs/heads/}
280-
fi
281-
282-
case "${git_branch}" in
283-
"main" | "master" )
284-
if [ "${{ env.LATEST }}" = "TRUE" ] || [ "${DISTRO_VARIANT}" = "${{ secrets.LATEST }}" ]; then
285-
image_latest=",${GITHUB_REPOSITORY}:latest"
286-
fi
287-
if [ "${DISTRO_VARIANT}" = "${{ secrets.LATEST_ALPINE }}" ]; then
288-
image_latest+=",${GITHUB_REPOSITORY}:${DISTRO}"
289-
fi
290-
branch_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}${image_latest}"
291-
;;
292-
"develop" )
293-
branch_tag="${GITHUB_REPOSITORY}:develop"
294-
;;
295-
esac
296-
fi
297-
298-
if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
299-
git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')"
300-
fi
301-
302-
if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then
303-
image_tags=${branch_tag},${git_tag}
304-
else
305-
image_tags="${branch_tag}${git_tag}"
306-
fi
307-
308-
echo "dockerhub_repo=${GITHUB_REPOSITORY/docker-/}" >> $GITHUB_ENV
309-
dockerhub_images=$(echo "${image_tags}" | sed "s|${GITHUB_REPOSITORY}|docker.io/${GITHUB_REPOSITORY/docker-/}|g")
310-
ghcr_images=$(echo "${image_tags}" | sed "s|${GITHUB_REPOSITORY}|ghcr.io/${GITHUB_REPOSITORY}|g")
311-
echo "container_images=${dockerhub_images},${ghcr_images}" >> $GITHUB_OUTPUT
312-
- name: Label
313-
id: Label
314-
run: |
315-
image_name=${GITHUB_REPOSITORY/docker-/}
316-
if [ -f "${{ env.build_file }}" ] ; then
317-
sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" ${{ env.build_file }}
318-
sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_commit=\"${GITHUB_SHA}\"" ${{ env.build_file }}
319-
sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_committed_by=\"${GITHUB_ACTOR}\"" ${{ env.build_file }}
320-
sed -i "/FROM .*/a LABEL tiredofit.${image_name}.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" ${{ env.build_file }}
321-
sed -i "/FROM .*/a LABEL org.opencontainers.image.source https://github.com/${GITHUB_REPOSITORY}" ${{ env.build_file }}
322-
323-
if [ -f "CHANGELOG.md" ] ; then
324-
sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" ${{ env.build_file }}
325-
mkdir -p install/assets/.changelogs ; cp CHANGELOG.md install/assets/.changelogs/${GITHUB_REPOSITORY/\//_}.md
326-
fi
327-
328-
if [[ $GITHUB_REF == refs/tags/* ]]; then
329-
sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_tag=\"${GITHUB_REF#refs/tags/v}\"" ${{ env.build_file }}
330-
fi
331-
332-
if [[ $GITHUB_REF == refs/heads/* ]]; then
333-
sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_branch=\"${GITHUB_REF#refs/heads/}\"" ${{ env.build_file }}
334-
fi
335-
fi
336-
- name: Set up Docker Buildx
337-
id: buildx
338-
uses: docker/setup-buildx-action@v2
339-
340-
- name: Set up QEMU
341-
uses: docker/setup-qemu-action@v2
342-
with:
343-
platforms: arm,arm64
344-
345-
- name: Login to DockerHub
346-
if: github.event_name != 'pull_request'
347-
uses: docker/login-action@v2
348-
with:
349-
username: ${{ secrets.DOCKER_USERNAME }}
350-
password: ${{ secrets.DOCKER_PASSWORD }}
351-
352-
- name: Login to GitHub Container Registry
353-
if: github.event_name != 'pull_request'
354-
uses: docker/login-action@v2
355-
with:
356-
registry: ghcr.io
357-
username: ${{ github.actor }}
358-
password: ${{ secrets.GITHUB_TOKEN }}
359-
360-
- name: Build
361-
if: github.event_name != 'pull_request'
362-
uses: docker/build-push-action@v4
363-
with:
364-
builder: ${{ steps.buildx.outputs.name }}
365-
context: .
366-
file: ./${{ env.build_file }}
367-
platforms: linux/amd64,linux/arm64,linux/arm/v7
368-
push: true
369-
tags: ${{ steps.prep.outputs.container_images }}
370-
build-args: |
371-
DISTRO=${{ env.DISTRO }}
372-
DISTRO_VARIANT=${{ env.DISTRO_VARIANT }}
373260

374-
# - name: Update Docker Hub Information
375-
# if: github.event_name != 'pull_request'
376-
# uses: peter-evans/dockerhub-description@v3
377-
# with:
378-
# username: ${{ secrets.DOCKER_USERNAME }}
379-
# password: ${{ secrets.DOCKER_PASSWORD }}
380-
# repository: ${{ env.dockerhub_repo }}
381-
# short-description: ${{ github.event.repository.description }}
382-
# readme-filepath: ./README.md
383261
###
384262
alpine_3-15:
385263
env:

‎.github/workflows/manual.yml‎

Lines changed: 2 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,10 @@ jobs:
131131
# short-description: ${{ github.event.repository.description }}
132132
# readme-filepath: ./README.md
133133

134-
###
135-
alpine_3-17:
134+
alpine_3-18:
136135
env:
137136
DISTRO: "alpine"
138-
DISTRO_VARIANT: "3.17"
137+
DISTRO_VARIANT: "3.18"
139138
build_file: Dockerfile
140139
runs-on: ubuntu-latest
141140
steps:
@@ -254,128 +253,7 @@ jobs:
254253
# short-description: ${{ github.event.repository.description }}
255254
# readme-filepath: ./README.md
256255

257-
###
258-
alpine_3-16:
259-
env:
260-
DISTRO: "alpine"
261-
DISTRO_VARIANT: "3.16"
262-
build_file: Dockerfile
263-
runs-on: ubuntu-latest
264-
steps:
265-
- name: Checkout
266-
uses: actions/checkout@v3
267-
268-
- name: Prepare
269-
id: prep
270-
run: |
271-
if [[ "${GITHUB_REF}" == refs/heads/* ]]; then
272-
if [[ "${GITHUB_REF}" == refs/heads/*/* ]] ; then
273-
git_branch="${GITHUB_REPOSITORY/docker-/}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")"
274-
else
275-
git_branch=${GITHUB_REF#refs/heads/}
276-
fi
277-
278-
case "${git_branch}" in
279-
"main" | "master" )
280-
if [ "${{ env.LATEST }}" = "TRUE" ] || [ "${DISTRO_VARIANT}" = "${{ secrets.LATEST }}" ]; then
281-
image_latest=",${GITHUB_REPOSITORY}:latest"
282-
fi
283-
if [ "${DISTRO_VARIANT}" = "${{ secrets.LATEST_ALPINE }}" ]; then
284-
image_latest+=",${GITHUB_REPOSITORY}:${DISTRO}"
285-
fi
286-
branch_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}${image_latest}"
287-
;;
288-
"develop" )
289-
branch_tag="${GITHUB_REPOSITORY}:develop"
290-
;;
291-
esac
292-
fi
293-
294-
if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
295-
git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')"
296-
fi
297-
298-
if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then
299-
image_tags=${branch_tag},${git_tag}
300-
else
301-
image_tags="${branch_tag}${git_tag}"
302-
fi
303-
304-
echo "dockerhub_repo=${GITHUB_REPOSITORY/docker-/}" >> $GITHUB_ENV
305-
dockerhub_images=$(echo "${image_tags}" | sed "s|${GITHUB_REPOSITORY}|docker.io/${GITHUB_REPOSITORY/docker-/}|g")
306-
ghcr_images=$(echo "${image_tags}" | sed "s|${GITHUB_REPOSITORY}|ghcr.io/${GITHUB_REPOSITORY}|g")
307-
echo "container_images=${dockerhub_images},${ghcr_images}" >> $GITHUB_OUTPUT
308-
- name: Label
309-
id: Label
310-
run: |
311-
image_name=${GITHUB_REPOSITORY/docker-/}
312-
if [ -f "${{ env.build_file }}" ] ; then
313-
sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" ${{ env.build_file }}
314-
sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_commit=\"${GITHUB_SHA}\"" ${{ env.build_file }}
315-
sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_committed_by=\"${GITHUB_ACTOR}\"" ${{ env.build_file }}
316-
sed -i "/FROM .*/a LABEL tiredofit.${image_name}.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" ${{ env.build_file }}
317-
sed -i "/FROM .*/a LABEL org.opencontainers.image.source https://github.com/${GITHUB_REPOSITORY}" ${{ env.build_file }}
318-
319-
if [ -f "CHANGELOG.md" ] ; then
320-
sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" ${{ env.build_file }}
321-
mkdir -p install/assets/.changelogs ; cp CHANGELOG.md install/assets/.changelogs/${GITHUB_REPOSITORY/\//_}.md
322-
fi
323-
324-
if [[ $GITHUB_REF == refs/tags/* ]]; then
325-
sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_tag=\"${GITHUB_REF#refs/tags/v}\"" ${{ env.build_file }}
326-
fi
327-
328-
if [[ $GITHUB_REF == refs/heads/* ]]; then
329-
sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_branch=\"${GITHUB_REF#refs/heads/}\"" ${{ env.build_file }}
330-
fi
331-
fi
332-
- name: Set up Docker Buildx
333-
id: buildx
334-
uses: docker/setup-buildx-action@v2
335-
336-
- name: Set up QEMU
337-
uses: docker/setup-qemu-action@v2
338-
with:
339-
platforms: arm,arm64
340-
341-
- name: Login to DockerHub
342-
if: github.event_name != 'pull_request'
343-
uses: docker/login-action@v2
344-
with:
345-
username: ${{ secrets.DOCKER_USERNAME }}
346-
password: ${{ secrets.DOCKER_PASSWORD }}
347-
348-
- name: Login to GitHub Container Registry
349-
if: github.event_name != 'pull_request'
350-
uses: docker/login-action@v2
351-
with:
352-
registry: ghcr.io
353-
username: ${{ github.actor }}
354-
password: ${{ secrets.GITHUB_TOKEN }}
355-
356-
- name: Build
357-
if: github.event_name != 'pull_request'
358-
uses: docker/build-push-action@v4
359-
with:
360-
builder: ${{ steps.buildx.outputs.name }}
361-
context: .
362-
file: ./${{ env.build_file }}
363-
platforms: linux/amd64,linux/arm64,linux/arm/v7
364-
push: true
365-
tags: ${{ steps.prep.outputs.container_images }}
366-
build-args: |
367-
DISTRO=${{ env.DISTRO }}
368-
DISTRO_VARIANT=${{ env.DISTRO_VARIANT }}
369256

370-
# - name: Update Docker Hub Information
371-
# if: github.event_name != 'pull_request'
372-
# uses: peter-evans/dockerhub-description@v3
373-
# with:
374-
# username: ${{ secrets.DOCKER_USERNAME }}
375-
# password: ${{ secrets.DOCKER_PASSWORD }}
376-
# repository: ${{ env.dockerhub_repo }}
377-
# short-description: ${{ github.event.repository.description }}
378-
# readme-filepath: ./README.md
379257
###
380258
alpine_3-15:
381259
env:

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 6.3.1 2023-05-09 <dave at tiredofit dot ca>
2+
3+
### Added
4+
- Drop Alpine 3.17 and 3.16 builds and Introduce Alpine 3.18 build
5+
6+
17
## 6.3.0 2023-04-26 <dave at tiredofit dot ca>
28

39
### Added

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ The following image tags are available along with their tagged release based on
9292
| latest | `:latest` | latest | `:debian` |
9393
| latest | `:alpine` | Bookworm | `:debian-bookworm ` |
9494
| edge | `:alpine-edge` | Bullseye | `:debian-bullseye` |
95-
| 3.17 | `:alpine-3.17` | Buster | `:debian-buster` |
96-
| 3.12 | `:alpine-3.16` | | |
95+
| 3.18 | `:alpine-3.18` | Buster | `:debian-buster` |
9796
| 3.15 | `:alpine-3.15` | | |
9897
| 3.12 | `:alpine-3.12` | | |
9998
| 3.9 | `:alpine-3.9` | | |

0 commit comments

Comments
 (0)