From 2dde4f1cdc0400518e282a5aa7bc54ff69369eec Mon Sep 17 00:00:00 2001 From: "dave@tiredofit.ca" Date: Sat, 7 Dec 2024 16:29:28 -0800 Subject: [PATCH] Release 6.5.7 - See CHANGELOG.md --- .github/workflows/main.yml | 126 +++++++++++++++++++++++++++++++++++ .github/workflows/manual.yml | 126 +++++++++++++++++++++++++++++++++++ CHANGELOG.md | 7 ++ Dockerfile | 4 +- README.md | 3 +- 5 files changed, 263 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a329e41..904a86b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -125,6 +125,132 @@ jobs: DISTRO=${{ env.DISTRO }} DISTRO_VARIANT=${{ env.DISTRO_VARIANT }} +# - name: Update Docker Hub Information +# if: github.event_name != 'pull_request' +# uses: peter-evans/dockerhub-description@v3 +# with: +# username: ${{ secrets.DOCKER_USERNAME }} +# password: ${{ secrets.DOCKER_PASSWORD }} +# repository: ${{ env.dockerhub_repo }} +# short-description: ${{ github.event.repository.description }} +# readme-filepath: ./README.md + + alpine_3-21: + env: + DISTRO: "alpine" + DISTRO_VARIANT: "3.21" + build_file: Dockerfile + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Prepare + id: prep + run: | + if [[ "${GITHUB_REF}" == refs/heads/* ]]; then + if [[ "${GITHUB_REF}" == refs/heads/*/* ]] ; then + git_branch="${GITHUB_REPOSITORY/docker-/}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")" + else + git_branch=${GITHUB_REF#refs/heads/} + fi + + case "${git_branch}" in + "main" | "master" ) + if [ "${{ vars.LATEST }}" = "${DISTRO}-${DISTRO_VARIANT}" ] || [ "${{ secrets.LATEST }}" = "${DISTRO}-${DISTRO_VARIANT}" ]; then + image_latest=",${GITHUB_REPOSITORY}:latest" + fi + echo "*** LATEST_ALPINE ${{ vars.LATEST_ALPINE }}" + echo "**** VAR ${{ vars.LATEST_ALPINE }}" + env + + if [ "${DISTRO_VARIANT}" = "${{vars.LATEST_ALPINE }}" ]; then + image_latest+=",${GITHUB_REPOSITORY}:${DISTRO}" + fi + branch_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}${image_latest}" + ;; + "develop" ) + branch_tag="${GITHUB_REPOSITORY}:develop" + ;; + esac + fi + + if [[ "${GITHUB_REF}" == refs/tags/* ]]; then + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + fi + + if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then + image_tags=${branch_tag},${git_tag} + else + image_tags="${branch_tag}${git_tag}" + fi + + echo "dockerhub_repo=${GITHUB_REPOSITORY/docker-/}" >> $GITHUB_ENV + dockerhub_images=$(echo "${image_tags}" | sed "s|${GITHUB_REPOSITORY}|docker.io/${GITHUB_REPOSITORY/docker-/}|g") + ghcr_images=$(echo "${image_tags}" | sed "s|${GITHUB_REPOSITORY}|ghcr.io/${GITHUB_REPOSITORY}|g") + echo "container_images=${dockerhub_images},${ghcr_images}" >> $GITHUB_OUTPUT + - name: Label + id: Label + run: | + image_name=${GITHUB_REPOSITORY/docker-/} + if [ -f "${{ env.build_file }}" ] ; then + sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" ${{ env.build_file }} + sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_commit=\"${GITHUB_SHA}\"" ${{ env.build_file }} + sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_committed_by=\"${GITHUB_ACTOR}\"" ${{ env.build_file }} + sed -i "/FROM .*/a LABEL tiredofit.${image_name}.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" ${{ env.build_file }} + sed -i "/FROM .*/a LABEL org.opencontainers.image.source https://github.com/${GITHUB_REPOSITORY}" ${{ env.build_file }} + + if [ -f "CHANGELOG.md" ] ; then + sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" ${{ env.build_file }} + mkdir -p install/assets/.changelogs ; cp CHANGELOG.md install/assets/.changelogs/${GITHUB_REPOSITORY/\//_}.md + fi + + if [[ $GITHUB_REF == refs/tags/* ]]; then + sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_tag=\"${GITHUB_REF#refs/tags/v}\"" ${{ env.build_file }} + fi + + if [[ $GITHUB_REF == refs/heads/* ]]; then + sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_branch=\"${GITHUB_REF#refs/heads/}\"" ${{ env.build_file }} + fi + fi + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v2 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + with: + platforms: arm,arm64 + + - name: Login to DockerHub + if: github.event_name != 'pull_request' + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Login to GitHub Container Registry + if: github.event_name != 'pull_request' + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build + if: github.event_name != 'pull_request' + uses: docker/build-push-action@v4 + with: + builder: ${{ steps.buildx.outputs.name }} + context: . + file: ./${{ env.build_file }} + platforms: linux/amd64,linux/arm64,linux/arm/v7 + push: true + tags: ${{ steps.prep.outputs.container_images }} + build-args: | + DISTRO=${{ env.DISTRO }} + DISTRO_VARIANT=${{ env.DISTRO_VARIANT }} + # - name: Update Docker Hub Information # if: github.event_name != 'pull_request' # uses: peter-evans/dockerhub-description@v3 diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 2067b34..ac264c2 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -121,6 +121,132 @@ jobs: DISTRO=${{ env.DISTRO }} DISTRO_VARIANT=${{ env.DISTRO_VARIANT }} +# - name: Update Docker Hub Information +# if: github.event_name != 'pull_request' +# uses: peter-evans/dockerhub-description@v3 +# with: +# username: ${{ secrets.DOCKER_USERNAME }} +# password: ${{ secrets.DOCKER_PASSWORD }} +# repository: ${{ env.dockerhub_repo }} +# short-description: ${{ github.event.repository.description }} +# readme-filepath: ./README.md + + alpine_3-21: + env: + DISTRO: "alpine" + DISTRO_VARIANT: "3.21" + build_file: Dockerfile + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Prepare + id: prep + run: | + if [[ "${GITHUB_REF}" == refs/heads/* ]]; then + if [[ "${GITHUB_REF}" == refs/heads/*/* ]] ; then + git_branch="${GITHUB_REPOSITORY/docker-/}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")" + else + git_branch=${GITHUB_REF#refs/heads/} + fi + + case "${git_branch}" in + "main" | "master" ) + if [ "${{ vars.LATEST }}" = "${DISTRO}-${DISTRO_VARIANT}" ] || [ "${{ secrets.LATEST }}" = "${DISTRO}-${DISTRO_VARIANT}" ]; then + image_latest=",${GITHUB_REPOSITORY}:latest" + fi + echo "*** LATEST_ALPINE ${{ vars.LATEST_ALPINE }}" + echo "**** VAR ${{ vars.LATEST_ALPINE }}" + env + + if [ "${DISTRO_VARIANT}" = "${{vars.LATEST_ALPINE }}" ]; then + image_latest+=",${GITHUB_REPOSITORY}:${DISTRO}" + fi + branch_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}${image_latest}" + ;; + "develop" ) + branch_tag="${GITHUB_REPOSITORY}:develop" + ;; + esac + fi + + if [[ "${GITHUB_REF}" == refs/tags/* ]]; then + git_tag="${GITHUB_REPOSITORY}:${DISTRO}-${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')" + fi + + if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then + image_tags=${branch_tag},${git_tag} + else + image_tags="${branch_tag}${git_tag}" + fi + + echo "dockerhub_repo=${GITHUB_REPOSITORY/docker-/}" >> $GITHUB_ENV + dockerhub_images=$(echo "${image_tags}" | sed "s|${GITHUB_REPOSITORY}|docker.io/${GITHUB_REPOSITORY/docker-/}|g") + ghcr_images=$(echo "${image_tags}" | sed "s|${GITHUB_REPOSITORY}|ghcr.io/${GITHUB_REPOSITORY}|g") + echo "container_images=${dockerhub_images},${ghcr_images}" >> $GITHUB_OUTPUT + - name: Label + id: Label + run: | + image_name=${GITHUB_REPOSITORY/docker-/} + if [ -f "${{ env.build_file }}" ] ; then + sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" ${{ env.build_file }} + sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_commit=\"${GITHUB_SHA}\"" ${{ env.build_file }} + sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_committed_by=\"${GITHUB_ACTOR}\"" ${{ env.build_file }} + sed -i "/FROM .*/a LABEL tiredofit.${image_name}.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" ${{ env.build_file }} + sed -i "/FROM .*/a LABEL org.opencontainers.image.source https://github.com/${GITHUB_REPOSITORY}" ${{ env.build_file }} + + if [ -f "CHANGELOG.md" ] ; then + sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" ${{ env.build_file }} + mkdir -p install/assets/.changelogs ; cp CHANGELOG.md install/assets/.changelogs/${GITHUB_REPOSITORY/\//_}.md + fi + + if [[ $GITHUB_REF == refs/tags/* ]]; then + sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_tag=\"${GITHUB_REF#refs/tags/v}\"" ${{ env.build_file }} + fi + + if [[ $GITHUB_REF == refs/heads/* ]]; then + sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_branch=\"${GITHUB_REF#refs/heads/}\"" ${{ env.build_file }} + fi + fi + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v2 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + with: + platforms: arm,arm64 + + - name: Login to DockerHub + if: github.event_name != 'pull_request' + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Login to GitHub Container Registry + if: github.event_name != 'pull_request' + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build + if: github.event_name != 'pull_request' + uses: docker/build-push-action@v4 + with: + builder: ${{ steps.buildx.outputs.name }} + context: . + file: ./${{ env.build_file }} + platforms: linux/amd64,linux/arm64,linux/arm/v7 + push: true + tags: ${{ steps.prep.outputs.container_images }} + build-args: | + DISTRO=${{ env.DISTRO }} + DISTRO_VARIANT=${{ env.DISTRO_VARIANT }} + # - name: Update Docker Hub Information # if: github.event_name != 'pull_request' # uses: peter-evans/dockerhub-description@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e62fee..3e4bf47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 6.5.7 2024-12-07 + + ### Added + - Pin to tiredofit/alpine:7.10.24 + - Add Alpine 3.21 builds + + ## 6.5.6 2024-11-26 ### Added diff --git a/Dockerfile b/Dockerfile index 0a3f841..eda9012 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG DISTRO=alpine -ARG DISTRO_VARIANT=3.20 +ARG DISTRO_VARIANT=3.21 -FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT}-7.10.19 +FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT}-7.10.24 LABEL maintainer="Dave Conroy (github.com/tiredofit)" ARG NGINX_VERSION diff --git a/README.md b/README.md index e3cd6b7..44e4a03 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,8 @@ The following image tags are available along with their tagged release based on | latest | `:latest` | latest | `:debian` | | latest | `:alpine` | Bookworm | `:debian-bookworm ` | | edge | `:alpine-edge` | Bullseye | `:debian-bullseye` | -| 3.20 | `:alpine-3.20` | Buster | `:debian-buster` | +| 3.21 | `:alpine-3.21` | Buster | `:debian-buster` | +| 3.20 | `:alpine-3.20` | | | | 3.19 | `:alpine-3.19` | | | | 3.16 | `:alpine-3.16` | | | | 3.15 | `:alpine-3.15` | | |