From 8c2e5650cfb2469287cd1cea209174d3689d510b Mon Sep 17 00:00:00 2001 From: Dave Conroy Date: Sun, 5 Jun 2022 08:52:23 -0700 Subject: [PATCH] Drop Debian Jessie and Stretch --- .dockerignore | 1 + .github/workflows/main.yml | 213 ----------------------------------- .github/workflows/manual.yml | 213 ----------------------------------- README.md | 8 +- 4 files changed, 6 insertions(+), 429 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..d838da9 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +examples/ diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7d515bf..daf09d9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1596,216 +1596,3 @@ jobs: push: true tags: ${{ steps.prep.outputs.tags }} - debian-stretch: - env: - RELEASE: stretch - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Prepare - id: prep - run: | - DOCKER_IMAGE=${GITHUB_REPOSITORY/docker-/} - set -x - if [[ $GITHUB_REF == refs/heads/* ]]; then - if [[ $GITHUB_REF == refs/heads/*/* ]] ; then - BRANCH="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")" - else - BRANCH=${GITHUB_REF#refs/heads/} - fi - - case ${BRANCH} in - "main" | "master" ) - BRANCHTAG="${DOCKER_IMAGE}:debian-${RELEASE},${DOCKER_IMAGE}:debian-${RELEASE}-latest" - ;; - "develop" ) - BRANCHTAG="${DOCKER_IMAGE}:debian-${RELEASE}-develop" - ;; - * ) - if [ -n "${{ secrets.LATEST }}" ] ; then - if [ "${BRANCHTAG}" = "${{ secrets.LATEST }}" ]; then - BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest,${DOCKER_IMAGE}:latest" - else - BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest" - fi - else - BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest" - fi - ;; - esac - fi - - if [[ $GITHUB_REF == refs/tags/* ]]; then - GITTAG="${DOCKER_IMAGE}:debian-${RELEASE}-$(echo $GITHUB_REF | sed 's|refs/tags/||g')" - fi - - if [ -n "${BRANCHTAG}" ] && [ -n "${GITTAG}" ]; then - TAGS=${BRANCHTAG},${GITTAG} - else - TAGS="${BRANCHTAG}${GITTAG}" - fi - - echo ::set-output name=tags::${TAGS} - echo ::set-output name=docker_image::${DOCKER_IMAGE} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - with: - platforms: all - - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2 - - - 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: Label - id: Label - run: | - if [ -f "Dockerfile" ] ; then - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" Dockerfile.debian - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_commit=\"${GITHUB_SHA}\"" Dockerfile.debian - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_committed_by=\"${GITHUB_ACTOR}\"" Dockerfile.debian - sed -i "/FROM .*/a LABEL tiredofit.nginx.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" Dockerfile.debian - if [ -f "CHANGELOG.md" ] ; then - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" Dockerfile.debian - 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.nginx.git_tag=\"${GITHUB_REF#refs/tags/v}\"" Dockerfile.debian - fi - - if [[ $GITHUB_REF == refs/heads/* ]]; then - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_branch=\"${GITHUB_REF#refs/heads/}\"" Dockerfile.debian - fi - fi - - - name: Switch - id: Switch - run: | - sed -i "s|FROM docker.io/tiredofit/debian:.*|FROM docker.io/tiredofit/debian:stretch|g" Dockerfile.debian - - - name: Build - uses: docker/build-push-action@v3 - with: - builder: ${{ steps.buildx.outputs.name }} - context: . - file: ./Dockerfile.debian - platforms: linux/amd64,linux/arm/v7,linux/arm64 - push: true - tags: ${{ steps.prep.outputs.tags }} - - debian-jessie: - env: - RELEASE: jessie - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Prepare - id: prep - run: | - DOCKER_IMAGE=${GITHUB_REPOSITORY/docker-/} - set -x - if [[ $GITHUB_REF == refs/heads/* ]]; then - if [[ $GITHUB_REF == refs/heads/*/* ]] ; then - BRANCH="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")" - else - BRANCH=${GITHUB_REF#refs/heads/} - fi - - case ${BRANCH} in - "main" | "master" ) - BRANCHTAG="${DOCKER_IMAGE}:debian-${RELEASE},${DOCKER_IMAGE}:debian-${RELEASE}-latest" - ;; - "develop" ) - BRANCHTAG="${DOCKER_IMAGE}:debian-${RELEASE}-develop" - ;; - * ) - if [ -n "${{ secrets.LATEST }}" ] ; then - if [ "${BRANCHTAG}" = "${{ secrets.LATEST }}" ]; then - BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest,${DOCKER_IMAGE}:latest" - else - BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest" - fi - else - BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest" - fi - ;; - esac - fi - - if [[ $GITHUB_REF == refs/tags/* ]]; then - GITTAG="${DOCKER_IMAGE}:debian-${RELEASE}-$(echo $GITHUB_REF | sed 's|refs/tags/||g')" - fi - - if [ -n "${BRANCHTAG}" ] && [ -n "${GITTAG}" ]; then - TAGS=${BRANCHTAG},${GITTAG} - else - TAGS="${BRANCHTAG}${GITTAG}" - fi - - echo ::set-output name=tags::${TAGS} - echo ::set-output name=docker_image::${DOCKER_IMAGE} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - with: - platforms: all - - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2 - - - 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: Label - id: Label - run: | - if [ -f "Dockerfile" ] ; then - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" Dockerfile.debian - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_commit=\"${GITHUB_SHA}\"" Dockerfile.debian - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_committed_by=\"${GITHUB_ACTOR}\"" Dockerfile.debian - sed -i "/FROM .*/a LABEL tiredofit.nginx.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" Dockerfile.debian - if [ -f "CHANGELOG.md" ] ; then - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" Dockerfile.debian - 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.nginx.git_tag=\"${GITHUB_REF#refs/tags/v}\"" Dockerfile.debian - fi - - if [[ $GITHUB_REF == refs/heads/* ]]; then - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_branch=\"${GITHUB_REF#refs/heads/}\"" Dockerfile.debian - fi - fi - - - name: Switch - id: Switch - run: | - sed -i "s|FROM docker.io/tiredofit/debian:.*|FROM docker.io/tiredofit/debian:${RELEASE}|g" Dockerfile.debian - - - name: Build - uses: docker/build-push-action@v3 - with: - builder: ${{ steps.buildx.outputs.name }} - context: . - file: ./Dockerfile.debian - platforms: linux/amd64,linux/arm/v7 - push: true - tags: ${{ steps.prep.outputs.tags }} diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 6500ed2..4cfed06 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -1593,216 +1593,3 @@ jobs: push: true tags: ${{ steps.prep.outputs.tags }} - debian-stretch: - env: - RELEASE: stretch - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Prepare - id: prep - run: | - DOCKER_IMAGE=${GITHUB_REPOSITORY/docker-/} - set -x - if [[ $GITHUB_REF == refs/heads/* ]]; then - if [[ $GITHUB_REF == refs/heads/*/* ]] ; then - BRANCH="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")" - else - BRANCH=${GITHUB_REF#refs/heads/} - fi - - case ${BRANCH} in - "main" | "master" ) - BRANCHTAG="${DOCKER_IMAGE}:debian-${RELEASE},${DOCKER_IMAGE}:debian-${RELEASE}-latest" - ;; - "develop" ) - BRANCHTAG="${DOCKER_IMAGE}:debian-${RELEASE}-develop" - ;; - * ) - if [ -n "${{ secrets.LATEST }}" ] ; then - if [ "${BRANCHTAG}" = "${{ secrets.LATEST }}" ]; then - BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest,${DOCKER_IMAGE}:latest" - else - BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest" - fi - else - BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest" - fi - ;; - esac - fi - - if [[ $GITHUB_REF == refs/tags/* ]]; then - GITTAG="${DOCKER_IMAGE}:debian-${RELEASE}-$(echo $GITHUB_REF | sed 's|refs/tags/||g')" - fi - - if [ -n "${BRANCHTAG}" ] && [ -n "${GITTAG}" ]; then - TAGS=${BRANCHTAG},${GITTAG} - else - TAGS="${BRANCHTAG}${GITTAG}" - fi - - echo ::set-output name=tags::${TAGS} - echo ::set-output name=docker_image::${DOCKER_IMAGE} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - with: - platforms: all - - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2 - - - 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: Label - id: Label - run: | - if [ -f "Dockerfile" ] ; then - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" Dockerfile.debian - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_commit=\"${GITHUB_SHA}\"" Dockerfile.debian - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_committed_by=\"${GITHUB_ACTOR}\"" Dockerfile.debian - sed -i "/FROM .*/a LABEL tiredofit.nginx.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" Dockerfile.debian - if [ -f "CHANGELOG.md" ] ; then - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" Dockerfile.debian - 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.nginx.git_tag=\"${GITHUB_REF#refs/tags/v}\"" Dockerfile.debian - fi - - if [[ $GITHUB_REF == refs/heads/* ]]; then - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_branch=\"${GITHUB_REF#refs/heads/}\"" Dockerfile.debian - fi - fi - - - name: Switch - id: Switch - run: | - sed -i "s|FROM docker.io/tiredofit/debian:.*|FROM docker.io/tiredofit/debian:stretch|g" Dockerfile.debian - - - name: Build - uses: docker/build-push-action@v3 - with: - builder: ${{ steps.buildx.outputs.name }} - context: . - file: ./Dockerfile.debian - platforms: linux/amd64,linux/arm/v7,linux/arm64 - push: true - tags: ${{ steps.prep.outputs.tags }} - - debian-jessie: - env: - RELEASE: jessie - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Prepare - id: prep - run: | - DOCKER_IMAGE=${GITHUB_REPOSITORY/docker-/} - set -x - if [[ $GITHUB_REF == refs/heads/* ]]; then - if [[ $GITHUB_REF == refs/heads/*/* ]] ; then - BRANCH="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")" - else - BRANCH=${GITHUB_REF#refs/heads/} - fi - - case ${BRANCH} in - "main" | "master" ) - BRANCHTAG="${DOCKER_IMAGE}:debian-${RELEASE},${DOCKER_IMAGE}:debian-${RELEASE}-latest" - ;; - "develop" ) - BRANCHTAG="${DOCKER_IMAGE}:debian-${RELEASE}-develop" - ;; - * ) - if [ -n "${{ secrets.LATEST }}" ] ; then - if [ "${BRANCHTAG}" = "${{ secrets.LATEST }}" ]; then - BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest,${DOCKER_IMAGE}:latest" - else - BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest" - fi - else - BRANCHTAG="${DOCKER_IMAGE}:${BRANCH},${DOCKER_IMAGE}:${BRANCH}-latest" - fi - ;; - esac - fi - - if [[ $GITHUB_REF == refs/tags/* ]]; then - GITTAG="${DOCKER_IMAGE}:debian-${RELEASE}-$(echo $GITHUB_REF | sed 's|refs/tags/||g')" - fi - - if [ -n "${BRANCHTAG}" ] && [ -n "${GITTAG}" ]; then - TAGS=${BRANCHTAG},${GITTAG} - else - TAGS="${BRANCHTAG}${GITTAG}" - fi - - echo ::set-output name=tags::${TAGS} - echo ::set-output name=docker_image::${DOCKER_IMAGE} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - with: - platforms: all - - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2 - - - 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: Label - id: Label - run: | - if [ -f "Dockerfile" ] ; then - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" Dockerfile.debian - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_commit=\"${GITHUB_SHA}\"" Dockerfile.debian - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_committed_by=\"${GITHUB_ACTOR}\"" Dockerfile.debian - sed -i "/FROM .*/a LABEL tiredofit.nginx.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" Dockerfile.debian - if [ -f "CHANGELOG.md" ] ; then - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" Dockerfile.debian - 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.nginx.git_tag=\"${GITHUB_REF#refs/tags/v}\"" Dockerfile.debian - fi - - if [[ $GITHUB_REF == refs/heads/* ]]; then - sed -i "/FROM .*/a LABEL tiredofit.nginx.git_branch=\"${GITHUB_REF#refs/heads/}\"" Dockerfile.debian - fi - fi - - - name: Switch - id: Switch - run: | - sed -i "s|FROM docker.io/tiredofit/debian:.*|FROM docker.io/tiredofit/debian:${RELEASE}|g" Dockerfile.debian - - - name: Build - uses: docker/build-push-action@v3 - with: - builder: ${{ steps.buildx.outputs.name }} - context: . - file: ./Dockerfile.debian - platforms: linux/amd64,linux/arm/v7 - push: true - tags: ${{ steps.prep.outputs.tags }} diff --git a/README.md b/README.md index a83b212..fb347c4 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,8 @@ The following image tags are available along with their tagged release based on | latest | `:latest` | latest | `:debian-latest` | | edge | `:alpine-edge` | Bullseye | `:debian-bullseye` | | 3.14 | `:alpine-3.14` | Buster | `:debian-buster` | -| 3.13 | `:alpine-3.14` | Stretch | `:debian-stretch` | -| 3.13 | `:alpine-3.13` | Jessie | `:debian-jessie` | +| 3.13 | `:alpine-3.14` | | | +| 3.13 | `:alpine-3.13` | | | | 3.12 | `:alpine-3.12` | | | | 3.11 | `:alpine-3.11` | | | | 3.10 | `:alpine-3.10` | | | @@ -96,7 +96,7 @@ The following image tags are available along with their tagged release based on docker pull tiredofit/nginx:(imagetag) ``` #### Multi Architecture -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)` +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)` ## Configuration @@ -107,6 +107,7 @@ Images are built primarily for `amd64` architecture, and may also include builds * Set various [environment variables](#environment-variables) to understand the capabilities of this image. * Map [persistent storage](#data-volumes) for access to configuration and data files for backup. * Make [networking ports](#networking) available for public access if necessary + ### Persistent Storage The container starts up and reads from `/etc/nginx/nginx.conf` for some basic configuration and to listen on port 73 internally for Nginx Status responses. `/etc/nginx/conf.d` contains a sample configuration file that can be used to customize a nginx server block. @@ -117,6 +118,7 @@ The following directories are used for configuration and can be mapped for persi | ----------- | ----------------------------------------------------------- | | `/www/html` | Drop your Datafiles in this Directory to be served by Nginx | | `/www/logs` | Logfiles for Nginx error and Access | + ### Environment Variables #### Base Images used