Skip to content

Commit 9e19928

Browse files
authored
v2.2.0 (#37)
Major updates - Using bfren namespacing
1 parent fe51b5b commit 9e19928

28 files changed

+117
-133
lines changed

.github/workflows/dev.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/checkout@v2
2424
-
2525
name: Read image version
26-
uses: bencgreen/read-file-action@v1
26+
uses: bfren/read-file-action@v1
2727
with:
2828
path: ./VERSION
2929
id: version
@@ -47,8 +47,8 @@ jobs:
4747
push: true
4848
platforms: linux/amd64,linux/arm/v7,linux/arm64
4949
tags: |
50-
bcgdesign/nginx-proxy:dev
51-
bcgdesign/nginx-proxy:${{ steps.version.outputs.content }}-beta
50+
bfren/nginx-proxy:dev
51+
bfren/nginx-proxy:${{ steps.version.outputs.content }}-beta
5252
-
5353
name: Image digest
5454
run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/checkout@v2
1515
-
1616
name: Read version
17-
uses: bencgreen/read-file-action@v1
17+
uses: bfren/read-file-action@v1
1818
with:
1919
path: ./VERSION
2020
id: version
@@ -38,8 +38,8 @@ jobs:
3838
push: true
3939
platforms: linux/amd64,linux/arm/v7,linux/arm64
4040
tags: |
41-
bcgdesign/nginx-proxy:latest
42-
bcgdesign/nginx-proxy:${{ steps.version.outputs.content }}
41+
bfren/nginx-proxy:latest
42+
bfren/nginx-proxy:${{ steps.version.outputs.content }}
4343
-
4444
name: Image digest
4545
run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/workflow-cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Delete old workflow runs
16-
uses: bencgreen/delete-workflow-runs@main
16+
uses: bfren/delete-workflow-runs@main
1717
with:
1818
token: ${{ secrets.GITHUB_TOKEN }}
1919
repository: ${{ github.repository }}

Dockerfile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
FROM bcgdesign/nginx:alpine3.13-2.1.4
2-
3-
LABEL maintainer="Ben Green <ben@bcgdesign.com>" \
4-
org.label-schema.name="Nginx Proxy" \
5-
org.label-schema.version="latest" \
6-
org.label-schema.vendor="Ben Green" \
7-
org.label-schema.schema-version="1.0"
1+
FROM bfren/nginx:alpine3.13-2.2.0
82

93
# port 80 is already exposed by the base image
104
EXPOSE 443
@@ -29,6 +23,6 @@ ENV \
2923

3024
COPY ./overlay /
3125

32-
RUN bcg-install
26+
RUN bf-install
3327

3428
VOLUME [ "/ssl", "/sites" ]

Dockerfile-automated

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
FROM bcgdesign/nginx:auto
2-
3-
LABEL maintainer="Ben Green <ben@bcgdesign.com>" \
4-
org.label-schema.name="Nginx Proxy" \
5-
org.label-schema.version="latest" \
6-
org.label-schema.vendor="Ben Green" \
7-
org.label-schema.schema-version="1.0"
1+
FROM bfren/nginx:auto
82

93
# port 80 is already exposed by the base image
104
EXPOSE 443
@@ -29,6 +23,6 @@ ENV \
2923

3024
COPY ./overlay /
3125

32-
RUN bcg-install
26+
RUN bf-install
3327

3428
VOLUME [ "/ssl", "/sites" ]

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2021 Ben Green
3+
Copyright (c) 2021 bfren.uk
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Docker Nginx Proxy
22

3-
![GitHub release (latest by date)](https://img.shields.io/github/v/release/bencgreen/docker-nginx-proxy) ![Docker Pulls](https://img.shields.io/docker/pulls/bcgdesign/nginx-proxy?label=pulls) ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/bcgdesign/nginx-proxy/latest?label=size)<br/>
4-
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/bencgreen/docker-nginx-proxy/dev?label=build)
3+
![GitHub release (latest by date)](https://img.shields.io/github/v/release/bfren/docker-nginx-proxy) ![Docker Pulls](https://img.shields.io/docker/pulls/bfren/nginx-proxy?label=pulls) ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/bfren/nginx-proxy/latest?label=size)<br/>
4+
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/bfren/docker-nginx-proxy/dev?label=build)
55

6-
[Docker Repository](https://hub.docker.com/r/bcgdesign/nginx-proxy) - [bcg|design ecosystem](https://github.com/bencgreen/docker)
6+
[Docker Repository](https://hub.docker.com/r/bfren/nginx-proxy) - [bfren ecosystem](https://github.com/bfren/docker)
77

88
Nginx Proxy which uses [getssl](https://github.com/srvrco/getssl) to automate requesting and renewing SSL certificates via Let's Encrypt. Certificates are checked for renewal every day - the last check can be viewed in the `/ssl` volume.
99

@@ -14,7 +14,7 @@ Nginx Proxy which uses [getssl](https://github.com/srvrco/getssl) to automate re
1414
* [Environment Variables](#environment-variables)
1515
* [Helper Functions](#helper-functions)
1616
* [Nginx Configuration Helpers](#nginx-configuration-helpers)
17-
* [Authors / Licence / Copyright](#authors)
17+
* [Licence / Copyright](#licence)
1818

1919
## Ports
2020

@@ -66,15 +66,11 @@ The image contains a handful of useful Nginx configuration 'helper' files, which
6666
| `-secure-headers.conf` | Standard secure headers - see [Mozilla SSL Configuration Generator](https://ssl-config.mozilla.org/). |
6767
| `-tls1_3-only.conf` | If you want to be ultra-secure (and not support older browsers), this will disable all TLS protocols except 1.3. |
6868

69-
## Authors
69+
## Licence
7070

71-
* [Ben Green](https://github.com/bencgreen)
72-
73-
## License
74-
75-
> [MIT](https://mit.bcgdesign.com/2020)
71+
> [MIT](https://mit.bfren.uk/2020)
7672
7773
## Copyright
7874

79-
> Copyright (c) 2021 Ben Green <https://bcgdesign.com>
75+
> Copyright (c) 2021 bfren.uk
8076
> Unless otherwise stated

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.4
1+
2.2.0

overlay/etc/bcg/templates/nginx-proxy.conf.esh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Use environment variable PROXY_URI to change this file.
66
#
7-
# Copyright (c) 2021 Ben Green <https://bcgdesign.com>
7+
# Copyright (c) 2021 bfren.uk
88
#======================================================================================================================
99

1010
#======================================================================================================================

overlay/etc/bcg/templates/nginx-site.conf.esh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# NGXCONF["<%= "${DOMAIN_NAME}" %>"]="custom"
1010
# This will stop this file being generated next time the container is started.
1111
#
12-
# Copyright (c) 2021 Ben Green <https://bcgdesign.com>
12+
# Copyright (c) 2021 bfren.uk
1313
#======================================================================================================================
1414
<% else -%>
1515
#======================================================================================================================
@@ -27,7 +27,7 @@
2727
# NGXCONF["<%= "${DOMAIN_NAME}" %>"]=""
2828
# This will cause this file to be regenerated next time the container is started.
2929
#
30-
# Copyright (c) 2021 Ben Green <https://bcgdesign.com>
30+
# Copyright (c) 2021 bfren.uk
3131
#======================================================================================================================
3232
<% fi %>
3333
#======================================================================================================================

0 commit comments

Comments
 (0)