Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jlesage/docker-nginx-proxy-manager
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.17.0
Choose a base ref
...
head repository: jlesage/docker-nginx-proxy-manager
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jul 6, 2021

  1. Copy the full SHA
    3aa8b82 View commit details

Commits on Jul 16, 2021

  1. Copy the full SHA
    177bff2 View commit details

Commits on Aug 4, 2021

  1. Copy the full SHA
    d1b41a9 View commit details
  2. Copy the full SHA
    32247fa View commit details
  3. Copy the full SHA
    0d42c76 View commit details

Commits on Aug 9, 2021

  1. Copy the full SHA
    5c837da View commit details
  2. Copy the full SHA
    f44acec View commit details

Commits on Aug 28, 2021

  1. Copy the full SHA
    6bcbec1 View commit details
  2. Copy the full SHA
    18753c4 View commit details

Commits on Aug 31, 2021

  1. Fixed typo. [skip ci]

    jlesage committed Aug 31, 2021
    Copy the full SHA
    a23509b View commit details

Commits on Sep 11, 2021

  1. Copy the full SHA
    f928375 View commit details
  2. Copy the full SHA
    4840195 View commit details

Commits on Sep 22, 2021

  1. Copy the full SHA
    6886f0e View commit details
  2. Copy the full SHA
    41baa14 View commit details

Commits on Nov 3, 2021

  1. Copy the full SHA
    7ee1809 View commit details
  2. Copy the full SHA
    9056117 View commit details

Commits on Nov 8, 2021

  1. Copy the full SHA
    f953b9f View commit details
  2. Copy the full SHA
    11ad0e2 View commit details

Commits on Dec 27, 2021

  1. Copy the full SHA
    67d9a93 View commit details
  2. Copy the full SHA
    79d18d1 View commit details
  3. Copy the full SHA
    c6adcb2 View commit details
  4. Copy the full SHA
    47fee22 View commit details
  5. Fixed typo in log filename.

    jlesage committed Dec 27, 2021
    Copy the full SHA
    3a6bb3f View commit details
  6. Fixed generation of resolvers.conf.

    This fixes scenarios where `resolv.conf` generated by dhcpcd has a nameserver with `%interface` appended to its IPv6 address.
    For example, a line like this must be properly handled:
    nameserver fe80::7747:4aff:fe9a:8cb1%br0
    jlesage committed Dec 27, 2021
    Copy the full SHA
    2816a73 View commit details
  7. Copy the full SHA
    edc657c View commit details

Commits on Dec 28, 2021

  1. Copy the full SHA
    eaa6919 View commit details
  2. Copy the full SHA
    9ff7e2b View commit details

Commits on Jan 2, 2022

  1. Copy the full SHA
    eefc977 View commit details
  2. Copy the full SHA
    75cda8c View commit details
  3. Copy the full SHA
    896dd88 View commit details
  4. Copy the full SHA
    283a38f View commit details

Commits on Jan 22, 2022

  1. Copy the full SHA
    25f10f7 View commit details
  2. Copy the full SHA
    c762600 View commit details
  3. Copy the full SHA
    da757f4 View commit details

Commits on Feb 23, 2022

  1. Copy the full SHA
    5c192d1 View commit details
  2. Copy the full SHA
    cf9f86f View commit details

Commits on Jun 2, 2022

  1. Copy the full SHA
    f4665db View commit details
  2. Copy the full SHA
    7748727 View commit details
  3. Copy the full SHA
    1dba310 View commit details

Commits on Oct 24, 2022

  1. Adjusted PayPal URL.

    jlesage committed Oct 24, 2022
    Copy the full SHA
    4762e66 View commit details

Commits on Feb 26, 2023

  1. Copy the full SHA
    0905fcb View commit details
  2. Copy the full SHA
    5b434c3 View commit details
  3. Updated documentation.

    jlesage committed Feb 26, 2023
    Copy the full SHA
    d601667 View commit details
  4. Copy the full SHA
    1cb225c View commit details
  5. Copy the full SHA
    61f1f3c View commit details

Commits on Feb 27, 2023

  1. Copy the full SHA
    d35f221 View commit details
  2. Copy the full SHA
    14cde42 View commit details
  3. Added mail module.

    jlesage committed Feb 27, 2023
    Copy the full SHA
    d27cd13 View commit details
  4. Copy the full SHA
    44a3a93 View commit details

Commits on Feb 28, 2023

  1. Useu a different tag that includes the arm64 suffix (without the v8).

    The missing `TARGETVARIANT` is not a bug.  See docker/buildx#1652
    jlesage committed Feb 28, 2023
    Copy the full SHA
    bf48ff0 View commit details
86 changes: 0 additions & 86 deletions .drone.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: https://paypal.me/JocelynLeSage/0usd
custom: ["https://paypal.me/JocelynLeSage", "https://www.tesla.com/referral/jocelyn4590"]
93 changes: 93 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
name: Bug report
description: File a bug report.
title: "[Bug] Provide a short description of the bug here"
labels: ["bug"]
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: textarea
attributes:
label: Current Behavior
description: A concise description of what you're experiencing.
validations:
required: true
- type: textarea
attributes:
label: Expected Behavior
description: A concise description of what you expected to happen.
validations:
required: false
- type: textarea
attributes:
label: Steps To Reproduce
description: Steps to reproduce the behavior.
validations:
required: false
- type: textarea
attributes:
label: Environment
description: |
Provide details about the host running the container.
Examples:
- Operating system (e.g. Ubuntu, Windows, TrueNAS, openmediavault, unRAID, etc).
- Version of the operating system.
- CPU architecture (x86-64, arm, arm64, etc).
- Model of the device, if applicable (e.g. Raspberry Pi 4B, Synology DS418, QNAP TS-364, etc).
- The Docker version (output of `docker version`).
- Anything else specific to your environment. Examples:
- Network share (NFS, CIFS) mapped to the container.
- Docker running in LXC container.
- etc.
- If applicable, how the UI provided by the container is access:
- Browser (Chrome, Firefox, Edge, etc).
- Version of the browser.
- OS of the browser.
- Is the container accessed through a reverse proxy.
- etc.
value: |
- OS:
- OS version:
- CPU:
- Docker version:
- Device model:
- Browser/OS:
validations:
required: false
- type: textarea
attributes:
label: Container creation
description: |
How did you create the container ?
Examples:
- The `docker run` command used.
- The compose file used.
- Screenshots of the management tool UI (e.g. Portainer, unRAID, etc) showing container settings.
validations:
required: true
- type: textarea
attributes:
label: Container log
description: Please copy/paste the output of `docker logs <container name>`.
render: text
validations:
required: true
- type: textarea
attributes:
label: Container inspect
description: |
If the container is running, please provide the output of `docker inspect <container name>`.
**Attention**: If you defined passwords, secrets or any sensitive information via environment variables, make sure to remove them from the output.
render: text
validations:
required: false
- type: textarea
attributes:
label: Anything else?
description: |
Anything that will give more context about the issue you are encountering.
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Ask a question, discuss
url: https://github.com/jlesage/docker-nginx-proxy-manager/discussions
about: Get help using this Docker container.
- name: Documentation
url: https://github.com/jlesage/docker-nginx-proxy-manager#readme
about: Documentation about this Docker container.
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Feature request
description: Suggest an idea for this project.
title: "[Feature request] Provide a short description of the feature here"
labels: ["enhancement"]
body:
- type: markdown
attributes:
value: |
Thank you for suggesting an idea to make this project better.
- type: textarea
attributes:
label: Idea
description: |
Please describe the desired behavior, pitch your idea, or suggest improvements.
validations:
required: true
151 changes: 151 additions & 0 deletions .github/workflows/build-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
name: Docker image CI/CD

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
DOCKER_IMAGE_NAME: jlesage/nginx-proxy-manager
PLATFORMS: linux/amd64,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64/v8

on:
push:
branches: '*'
tags:
- v[0-9][0-9].[0-9][0-9].[0-9]+
- v[0-9][0-9].[0-9][0-9].[0-9]+-pre.[0-9]+
pull_request:

jobs:
build:
name: Build image
runs-on: ubuntu-20.04

steps:
- name: Free disk space
uses: jlumbroso/free-disk-space@main
with:
tool-cache: true
android: true
dotnet: true
haskell: true
large-packages: true
docker-images: true
swap-storage: false

- name: Prepare
id: prep
run: |
# Determine the Docker container version.
VERSION=unknown
if [[ $GITHUB_REF =~ refs/tags/* ]]; then
# Git tag pushed: use tag as the version.
VERSION=${GITHUB_REF#refs/tags/}
elif [[ $GITHUB_REF =~ refs/heads/* ]]; then
# Git commit pushed: use the commit SHA as the version.
VERSION=${GITHUB_SHA::8}
elif [[ $GITHUB_REF =~ refs/pull/* ]]; then
# Pull request: use PR number as the version.
VERSION=pr-${{ github.event.number }}
else
echo "::error::Unexpected GITHUB_REF: $GITHUB_REF"
exit 1
fi
# Determine the version to put in container label.
LABEL_VERSION=${VERSION}
if [[ $GITHUB_REF =~ refs/tags/* ]]; then
# Do not include the starting 'v' of the version.
LABEL_VERSION=${VERSION:1}
fi
# Determine the Docker container tags.
TAGS="${{ env.DOCKER_IMAGE_NAME }}:${VERSION}"
if [[ $GITHUB_REF =~ refs/tags/* ]]; then
TAGS="$TAGS,${{ env.DOCKER_IMAGE_NAME }}:latest"
fi
# Determine the release type.
if [[ $GITHUB_REF =~ refs/tags/* ]]; then
IS_RELEASE=yes
if [[ $GITHUB_REF =~ -pre\.[0-9]+ ]]; then
RELEASE_TYPE="pre"
else
RELEASE_TYPE="standard"
fi
else
IS_RELEASE=no
RELEASE_TYPE="n/a"
fi
# Print results.
echo "::group::Results"
echo "Github reference: $GITHUB_REF"
echo "Release: $IS_RELEASE"
echo "Release type: $RELEASE_TYPE"
echo "Docker container version: $VERSION"
echo "Docker container version label: $LABEL_VERSION"
echo "Docker container tag(s): $TAGS"
echo "::endgroup::"
# Export outputs.
echo "is_release=${IS_RELEASE}" >> $GITHUB_OUTPUT
echo "release_type=${RELEASE_TYPE}" >> $GITHUB_OUTPUT
echo "version=${VERSION}" >> $GITHUB_OUTPUT
echo "label_version=${LABEL_VERSION}" >> $GITHUB_OUTPUT
echo "tags=${TAGS}" >> $GITHUB_OUTPUT
#echo "build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
- name: Setup QEMU
uses: docker/setup-qemu-action@v3
with:
platforms: arm,arm64,ppc64le,mips64,s390x

- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
if: ${{ steps.prep.outputs.is_release == 'yes' }}
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Build and push
uses: docker/build-push-action@v6
with:
push: ${{ steps.prep.outputs.is_release == 'yes' }}
provenance: false
platforms: ${{ env.PLATFORMS }}
tags: ${{ steps.prep.outputs.tags }}
build-args: |
DOCKER_IMAGE_VERSION=${{ steps.prep.outputs.label_version }}
cache-from: type=gha,scope=${{ env.DOCKER_IMAGE_NAME }}
cache-to: type=gha,mode=max,scope=${{ env.DOCKER_IMAGE_NAME }}

- name: Inspect
if: ${{ steps.prep.outputs.is_release == 'yes' }}
run: |
docker buildx imagetools inspect ${{ env.DOCKER_IMAGE_NAME }}:${{ steps.prep.outputs.version }}
- name: Checkout
uses: actions/checkout@v4
if: ${{ steps.prep.outputs.release_type == 'standard' }}

- name: Dockerhub description
if: ${{ steps.prep.outputs.release_type == 'standard' }}
uses: peter-evans/dockerhub-description@v4
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
repository: ${{ env.DOCKER_IMAGE_NAME }}
readme-filepath: DOCKERHUB.md

notification:
name: Notification
needs: [ build ]
runs-on: ubuntu-20.04
if: ${{ always() && github.event_name != 'pull_request' }}

steps:
- name: Pushover notification
uses: desiderati/github-action-pushover@v1
with:
job-status: ${{ needs.build.result }}
pushover-api-token: ${{ secrets.PUSHOVER_API_TOKEN }}
pushover-user-key: ${{ secrets.PUSHOVER_USER_KEY }}
14 changes: 0 additions & 14 deletions .travis.yml

This file was deleted.

Loading