Skip to content

Commit 1d3e5cc

Browse files
LePresidenteLePresidente
authored
Merge branch 'jlesage:master' into crowdsec_rework
2 parents c8379a1 + b9bb9f1 commit 1d3e5cc

File tree

7 files changed

+138
-8
lines changed

7 files changed

+138
-8
lines changed

‎.github/FUNDING.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
99
liberapay: # Replace with a single Liberapay username
1010
issuehunt: # Replace with a single IssueHunt username
1111
otechie: # Replace with a single Otechie username
12-
custom: https://paypal.me/JocelynLeSage
12+
custom: ["https://paypal.me/JocelynLeSage", "https://www.tesla.com/referral/jocelyn4590"]

‎.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
name: Bug report
2+
description: File a bug report.
3+
title: "[Bug] Provide a short description of the bug here"
4+
labels: ["bug"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this bug report!
10+
- type: textarea
11+
attributes:
12+
label: Current Behavior
13+
description: A concise description of what you're experiencing.
14+
validations:
15+
required: true
16+
- type: textarea
17+
attributes:
18+
label: Expected Behavior
19+
description: A concise description of what you expected to happen.
20+
validations:
21+
required: false
22+
- type: textarea
23+
attributes:
24+
label: Steps To Reproduce
25+
description: Steps to reproduce the behavior.
26+
validations:
27+
required: false
28+
- type: textarea
29+
attributes:
30+
label: Environment
31+
description: |
32+
Provide details about the host running the container.
33+
Examples:
34+
- Operating system (e.g. Ubuntu, Windows, TrueNAS, openmediavault, unRAID, etc).
35+
- Version of the operating system.
36+
- CPU architecture (x86-64, arm, arm64, etc).
37+
- Model of the device, if applicable (e.g. Raspberry Pi 4B, Synology DS418, QNAP TS-364, etc).
38+
- The Docker version (output of `docker version`).
39+
- Anything else specific to your environment. Examples:
40+
- Network share (NFS, CIFS) mapped to the container.
41+
- Docker running in LXC container.
42+
- etc.
43+
- If applicable, how the UI provided by the container is access:
44+
- Browser (Chrome, Firefox, Edge, etc).
45+
- Version of the browser.
46+
- OS of the browser.
47+
- Is the container accessed through a reverse proxy.
48+
- etc.
49+
value: |
50+
- OS:
51+
- OS version:
52+
- CPU:
53+
- Docker version:
54+
- Device model:
55+
- Browser/OS:
56+
validations:
57+
required: false
58+
- type: textarea
59+
attributes:
60+
label: Container creation
61+
description: |
62+
How did you create the container ?
63+
Examples:
64+
- The `docker run` command used.
65+
- The compose file used.
66+
- Screenshots of the management tool UI (e.g. Portainer, unRAID, etc) showing container settings.
67+
validations:
68+
required: true
69+
- type: textarea
70+
attributes:
71+
label: Container log
72+
description: Please copy/paste the output of `docker logs <container name>`.
73+
render: text
74+
validations:
75+
required: true
76+
- type: textarea
77+
attributes:
78+
label: Container inspect
79+
description: |
80+
If the container is running, please provide the output of `docker inspect <container name>`.
81+
**Attention**: If you defined passwords, secrets or any sensitive information via environment variables, make sure to remove them from the output.
82+
render: text
83+
validations:
84+
required: false
85+
- type: textarea
86+
attributes:
87+
label: Anything else?
88+
description: |
89+
Anything that will give more context about the issue you are encountering.
90+
91+
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
92+
validations:
93+
required: false

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: true
2+
contact_links:
3+
- name: Ask a question, discuss
4+
url: https://github.com/jlesage/docker-nginx-proxy-manager/discussions
5+
about: Get help using this Docker container.
6+
- name: Documentation
7+
url: https://github.com/jlesage/docker-nginx-proxy-manager#readme
8+
about: Documentation about this Docker container.

‎.github/ISSUE_TEMPLATE/feature-request.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Feature request
2+
description: Suggest an idea for this project.
3+
title: "[Feature request] Provide a short description of the feature here"
4+
labels: ["enhancement"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thank you for suggesting an idea to make this project better.
10+
- type: textarea
11+
attributes:
12+
label: Idea
13+
description: |
14+
Please describe the desired behavior, pitch your idea, or suggest improvements.
15+
validations:
16+
required: true

‎.github/workflows/build-image.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,6 @@ jobs:
9999
echo "tags=${TAGS}" >> $GITHUB_OUTPUT
100100
#echo "build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
101101
102-
- name: Checkout
103-
uses: actions/checkout@v3
104-
105102
- name: Setup QEMU
106103
uses: docker/setup-qemu-action@v2
107104
with:
@@ -134,6 +131,10 @@ jobs:
134131
run: |
135132
docker buildx imagetools inspect ${{ env.DOCKER_IMAGE_NAME }}:${{ steps.prep.outputs.version }}
136133
134+
- name: Checkout
135+
uses: actions/checkout@v3
136+
if: ${{ steps.prep.outputs.release_type == 'standard' }}
137+
137138
- name: Dockerhub description
138139
if: ${{ steps.prep.outputs.release_type == 'standard' }}
139140
uses: peter-evans/dockerhub-description@v3
@@ -147,7 +148,7 @@ jobs:
147148
name: Notification
148149
needs: [ build ]
149150
runs-on: ubuntu-20.04
150-
if: ${{ always() }}
151+
if: ${{ always() && github.event_name != 'pull_request' }}
151152

152153
steps:
153154
- name: Pushover notification

‎DOCKERHUB.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Docker container for Nginx Proxy Manager
2-
[![Docker Image Size](https://img.shields.io/docker/image-size/jlesage/nginx-proxy-manager/latest)](https://hub.docker.com/r/jlesage/nginx-proxy-manager/tags) [![Build Status](https://github.com/jlesage/docker-nginx-proxy-manager/actions/workflows/build-image.yml/badge.svg?branch=master)](https://github.com/jlesage/docker-nginx-proxy-manager/actions/workflows/build-image.yml) [![GitHub Release](https://img.shields.io/github/release/jlesage/docker-nginx-proxy-manager.svg)](https://github.com/jlesage/docker-nginx-proxy-manager/releases/latest) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/JocelynLeSage)
2+
[![Release](https://img.shields.io/github/release/jlesage/docker-nginx-proxy-manager.svg?logo=github&style=for-the-badge)](https://github.com/jlesage/docker-nginx-proxy-manager/releases/latest)
3+
[![Docker Image Size](https://img.shields.io/docker/image-size/jlesage/nginx-proxy-manager/latest?logo=docker&style=for-the-badge)](https://hub.docker.com/r/jlesage/nginx-proxy-manager/tags)
4+
[![Docker Pulls](https://img.shields.io/docker/pulls/jlesage/nginx-proxy-manager?label=Pulls&logo=docker&style=for-the-badge)](https://hub.docker.com/r/jlesage/nginx-proxy-manager)
5+
[![Docker Stars](https://img.shields.io/docker/stars/jlesage/nginx-proxy-manager?label=Stars&logo=docker&style=for-the-badge)](https://hub.docker.com/r/jlesage/nginx-proxy-manager)
6+
[![Build Status](https://img.shields.io/github/actions/workflow/status/jlesage/docker-nginx-proxy-manager/build-image.yml?logo=github&branch=master&style=for-the-badge)](https://github.com/jlesage/docker-nginx-proxy-manager/actions/workflows/build-image.yml)
7+
[![Source](https://img.shields.io/badge/Source-GitHub-blue?logo=github&style=for-the-badge)](https://github.com/jlesage/docker-nginx-proxy-manager)
8+
[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg?style=for-the-badge)](https://paypal.me/JocelynLeSage)
39

410
This is a Docker container for [Nginx Proxy Manager](https://nginxproxymanager.com).
511

‎README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
# Docker container for Nginx Proxy Manager
2-
[![Docker Image Size](https://img.shields.io/docker/image-size/jlesage/nginx-proxy-manager/latest)](https://hub.docker.com/r/jlesage/nginx-proxy-manager/tags) [![Build Status](https://github.com/jlesage/docker-nginx-proxy-manager/actions/workflows/build-image.yml/badge.svg?branch=master)](https://github.com/jlesage/docker-nginx-proxy-manager/actions/workflows/build-image.yml) [![GitHub Release](https://img.shields.io/github/release/jlesage/docker-nginx-proxy-manager.svg)](https://github.com/jlesage/docker-nginx-proxy-manager/releases/latest) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/JocelynLeSage)
2+
[![Release](https://img.shields.io/github/release/jlesage/docker-nginx-proxy-manager.svg?logo=github&style=for-the-badge)](https://github.com/jlesage/docker-nginx-proxy-manager/releases/latest)
3+
[![Docker Image Size](https://img.shields.io/docker/image-size/jlesage/nginx-proxy-manager/latest?logo=docker&style=for-the-badge)](https://hub.docker.com/r/jlesage/nginx-proxy-manager/tags)
4+
[![Docker Pulls](https://img.shields.io/docker/pulls/jlesage/nginx-proxy-manager?label=Pulls&logo=docker&style=for-the-badge)](https://hub.docker.com/r/jlesage/nginx-proxy-manager)
5+
[![Docker Stars](https://img.shields.io/docker/stars/jlesage/nginx-proxy-manager?label=Stars&logo=docker&style=for-the-badge)](https://hub.docker.com/r/jlesage/nginx-proxy-manager)
6+
[![Build Status](https://img.shields.io/github/actions/workflow/status/jlesage/docker-nginx-proxy-manager/build-image.yml?logo=github&branch=master&style=for-the-badge)](https://github.com/jlesage/docker-nginx-proxy-manager/actions/workflows/build-image.yml)
7+
[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg?style=for-the-badge)](https://paypal.me/JocelynLeSage)
38

4-
This is a Docker container for [Nginx Proxy Manager](https://nginxproxymanager.com).
9+
This project implements a Docker container for [Nginx Proxy Manager](https://nginxproxymanager.com).
510

611

712

@@ -69,6 +74,7 @@ docker run [-d] \
6974
[-p <HOST_PORT>:<CONTAINER_PORT>]... \
7075
jlesage/nginx-proxy-manager
7176
```
77+
7278
| Parameter | Description |
7379
|-----------|-------------|
7480
| -d | Run the container in the background. If not set, the container runs in the foreground. |

0 commit comments

Comments
 (0)