From 919099dbf0a680f87fca05d41eb87c75bda319a0 Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Mon, 15 Jun 2020 22:35:16 +0100 Subject: [PATCH 01/19] postgres 12 - initial commit --- .github/workflows/{v1.0.yml => v12.yml} | 2 +- Dockerfile | 4 ++-- README.md | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) rename .github/workflows/{v1.0.yml => v12.yml} (88%) create mode 100644 README.md diff --git a/.github/workflows/v1.0.yml b/.github/workflows/v12.yml similarity index 88% rename from .github/workflows/v1.0.yml rename to .github/workflows/v12.yml index b42fb81..00f19c6 100644 --- a/.github/workflows/v1.0.yml +++ b/.github/workflows/v12.yml @@ -1,4 +1,4 @@ -name: Publish GraphIP Postgres Image [1.0] +name: Publish GraphIP Postgres Image [12] on: [push] jobs: build: diff --git a/Dockerfile b/Dockerfile index 30995fb..1204570 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM postgres:11 +FROM postgres:12 LABEL maintainer="AIGIS Services Ltd" -RUN apt-get update && apt-get install postgresql-11-ip4r -y \ No newline at end of file +RUN apt-get update && apt-get install postgresql-12-ip4r -y \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..cc2dcdf --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +## Custom Postgres Docker Image for GraphIP DB + +Required Postgres Extensions pre-installed. \ No newline at end of file From 5ee87bd67c06b48d485a5d0738e5dbd91284f292 Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Fri, 26 Jun 2020 23:27:18 +0100 Subject: [PATCH 02/19] =?UTF-8?q?=E2=9E=95=20Add=20gitignore,=20.dockerign?= =?UTF-8?q?ore,=20LICENSE;=20Update=20Dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 5 +++++ .gitignore | 1 + Dockerfile | 4 +++- LICENSE | 21 +++++++++++++++++++++ README.md | 15 ++++++++++++++- 5 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 .dockerignore create mode 100644 .gitignore create mode 100644 LICENSE diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..9eae36e --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +.idea/ +.git/ +.gitignore +README.md +LICENCE \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..62c8935 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 1204570..122377d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,4 +2,6 @@ FROM postgres:12 LABEL maintainer="AIGIS Services Ltd" -RUN apt-get update && apt-get install postgresql-12-ip4r -y \ No newline at end of file +RUN apt-get update && \ + apt-get install --no-install-recommends postgresql-12-ip4r -y \ + && rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1605085 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018 Jonas Stoehr + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index cc2dcdf..8528318 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,16 @@ ## Custom Postgres Docker Image for GraphIP DB -Required Postgres Extensions pre-installed. \ No newline at end of file +# Supported tags + +- `11`, `12`, `latest` + +# Quick reference + +- **Where to get help**: + [the Docker Community Forums](https://forums.docker.com/), [the Docker Community Slack](https://blog.docker.com/2016/11/introducing-docker-community-directory-docker-community-slack/), or [Stack Overflow](https://stackoverflow.com/search?tab=newest&q=docker) + +- **Where to file issues**: + [https://github.com/graphip/postgres-ip4r/issues](https://github.com/graphip/postgres/issues) + +- **Maintained by**: + [Colin Wilson](https://github.com/colinwilson) \ No newline at end of file From a4230a1d04d3156fb74f3827b4ea538e931c9e6b Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Wed, 5 Aug 2020 06:56:58 +0100 Subject: [PATCH 03/19] add GeoLite2 files to container --- .github/workflows/v12.yml | 5 ++++- Dockerfile | 15 ++++++++++++++- LICENSE | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/v12.yml b/.github/workflows/v12.yml index 00f19c6..5cbdfb0 100644 --- a/.github/workflows/v12.yml +++ b/.github/workflows/v12.yml @@ -7,7 +7,10 @@ jobs: - uses: actions/checkout@master - name: Publish to Registry uses: elgohr/Publish-Docker-Github-Action@master + env: + MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }} with: name: graphip/postgres username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} \ No newline at end of file + password: ${{ secrets.DOCKER_PASSWORD }} + buildargs: MAXMIND_LICENSE_KEY \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 122377d..99b5313 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,5 +3,18 @@ FROM postgres:12 LABEL maintainer="AIGIS Services Ltd" RUN apt-get update && \ - apt-get install --no-install-recommends postgresql-12-ip4r -y \ + apt-get install --no-install-recommends \ + ca-certificates \ + unzip \ + postgresql-12-ip4r -y \ + && cd /tmp \ + && wget -nv -O GeoLite2-City-CSV.zip "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City-CSV&license_key=${MAXMIND_LICENSE_KEY}&suffix=zip" \ + && wget -nv -O GeoLite2-ASN-CSV.zip "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN-CSV&license_key=${MAXMIND_LICENSE_KEY}&suffix=zip" \ + && unzip GeoLite2-City-CSV.zip && unzip GeoLite2-ASN-CSV.zip \ + && cd /tmp/GeoLite2-City-CSV_* && mv * .. \ + && cd /tmp/GeoLite2-ASN-CSV_* && mv * .. \ + && cd .. \ + && rm -rf /tmp/GeoLite2-ASN-CSV* \ + && rm -rf /tmp/GeoLite2-City-CSV* \ + && rm *.txt && ls -alh \ && rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/LICENSE b/LICENSE index 1605085..e3a7aaf 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018 Jonas Stoehr +Copyright (c) 2020 AIGIS Services Ltd Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 35d54c636a5c45de4e431db2a028aa7956f332e6 Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Wed, 5 Aug 2020 06:58:52 +0100 Subject: [PATCH 04/19] install missing 'wget' --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 99b5313..d476a6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ LABEL maintainer="AIGIS Services Ltd" RUN apt-get update && \ apt-get install --no-install-recommends \ ca-certificates \ + wget \ unzip \ postgresql-12-ip4r -y \ && cd /tmp \ From 7acde0d9fb0842dfe3becf97fbd3b95f6e33f2bb Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Wed, 5 Aug 2020 07:37:26 +0100 Subject: [PATCH 05/19] add MAXMIND_LICENSE_KEY argument to dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index d476a6b..4c8c48e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,8 @@ FROM postgres:12 LABEL maintainer="AIGIS Services Ltd" +ARG MAXMIND_LICENSE_KEY + RUN apt-get update && \ apt-get install --no-install-recommends \ ca-certificates \ From 5854c122a56a8179723363e6cd12127da3998a21 Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Tue, 8 Dec 2020 22:33:10 +0000 Subject: [PATCH 06/19] =?UTF-8?q?=F0=9F=90=B3=20update=20Dockerfile=20?= =?UTF-8?q?=F0=9F=93=84=20update=20readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 10 +++++++--- README.md | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4c8c48e..69db1cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,12 +4,16 @@ LABEL maintainer="AIGIS Services Ltd" ARG MAXMIND_LICENSE_KEY -RUN apt-get update && \ - apt-get install --no-install-recommends \ +RUN apt-get update \ + && apt-get install --no-install-recommends \ ca-certificates \ wget \ unzip \ + + # install ip4r postgresql-12-ip4r -y \ + + # download and unzip maxmind DB's && cd /tmp \ && wget -nv -O GeoLite2-City-CSV.zip "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City-CSV&license_key=${MAXMIND_LICENSE_KEY}&suffix=zip" \ && wget -nv -O GeoLite2-ASN-CSV.zip "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN-CSV&license_key=${MAXMIND_LICENSE_KEY}&suffix=zip" \ @@ -20,4 +24,4 @@ RUN apt-get update && \ && rm -rf /tmp/GeoLite2-ASN-CSV* \ && rm -rf /tmp/GeoLite2-City-CSV* \ && rm *.txt && ls -alh \ - && rm -rf /var/lib/apt/lists/* \ No newline at end of file + && rm -rf /var/lib/apt/lists/* /var/tmp/* \ No newline at end of file diff --git a/README.md b/README.md index 8528318..54535cd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -## Custom Postgres Docker Image for GraphIP DB +## Postgres Docker Image + +Unmodified Postgres with some useful plugins. Provides required extensions for use within our stack. # Supported tags From b7e2e1b81aa45a0ee413c1bd3e054208b9ef09e2 Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Tue, 8 Dec 2020 22:42:50 +0000 Subject: [PATCH 07/19] =?UTF-8?q?=F0=9F=93=84=20update=20readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 54535cd..5cf4441 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,11 @@ -## Postgres Docker Image +# Postgres Docker Image Unmodified Postgres with some useful plugins. Provides required extensions for use within our stack. +## Features + +- ✅ [IP4R](https://github.com/RhodiumToad/ip4r). A PostgreSQL extension supporting 6 data types allowing you to store IPv4 & IPv6 addresses in a PostgreSQL table. + # Supported tags - `11`, `12`, `latest` From f95ff37a509bef0fbcb5fd1019b2803491d5c64b Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Wed, 9 Dec 2020 06:17:25 +0000 Subject: [PATCH 08/19] =?UTF-8?q?=F0=9F=93=84=20readme=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5cf4441..ba0b447 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Unmodified Postgres with some useful plugins. Provides required extensions for u # Supported tags -- `11`, `12`, `latest` +- `11`, `12`, `13`, `latest (13)` # Quick reference From 0bc97b7790f1007d1acd6d8d22d77cdc5cdf84a0 Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Wed, 9 Dec 2020 06:35:45 +0000 Subject: [PATCH 09/19] =?UTF-8?q?=F0=9F=90=9B=20remove=20dockerfile=20emtp?= =?UTF-8?q?y=20continuation=20lines?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 69db1cc..6fa8e4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,10 +9,8 @@ RUN apt-get update \ ca-certificates \ wget \ unzip \ - # install ip4r postgresql-12-ip4r -y \ - # download and unzip maxmind DB's && cd /tmp \ && wget -nv -O GeoLite2-City-CSV.zip "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City-CSV&license_key=${MAXMIND_LICENSE_KEY}&suffix=zip" \ From d27fd00db710dc15183af844eafff2c4478130a4 Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Wed, 9 Dec 2020 06:43:02 +0000 Subject: [PATCH 10/19] =?UTF-8?q?=F0=9F=90=B3=20update=20dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6fa8e4a..8816101 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,8 @@ RUN apt-get update \ && cd /tmp \ && wget -nv -O GeoLite2-City-CSV.zip "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City-CSV&license_key=${MAXMIND_LICENSE_KEY}&suffix=zip" \ && wget -nv -O GeoLite2-ASN-CSV.zip "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN-CSV&license_key=${MAXMIND_LICENSE_KEY}&suffix=zip" \ - && unzip GeoLite2-City-CSV.zip && unzip GeoLite2-ASN-CSV.zip \ + && unzip GeoLite2-City-CSV.zip \ + && unzip GeoLite2-ASN-CSV.zip \ && cd /tmp/GeoLite2-City-CSV_* && mv * .. \ && cd /tmp/GeoLite2-ASN-CSV_* && mv * .. \ && cd .. \ From a73a085851dd0cc9d81fe50aeb37f8c3cc2c9f03 Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Wed, 9 Dec 2020 06:50:56 +0000 Subject: [PATCH 11/19] =?UTF-8?q?=F0=9F=93=84=20readme=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ba0b447..1d76b6b 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ Unmodified Postgres with some useful plugins. Provides required extensions for u ## Features - ✅ [IP4R](https://github.com/RhodiumToad/ip4r). A PostgreSQL extension supporting 6 data types allowing you to store IPv4 & IPv6 addresses in a PostgreSQL table. +- ✅ [Maxmind GeoLite2 DB](https://dev.maxmind.com/geoip/geoip2/geolite2/). Maxmind's GeoLite2 City and ASN databases in CSV format ( available in the home (`~/`) directory ). + # Supported tags From 31b6105f4ee04f6c239a842c00a5b5b29ac8b69b Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Wed, 9 Dec 2020 07:14:48 +0000 Subject: [PATCH 12/19] =?UTF-8?q?=F0=9F=95=90=20add=20github=20actions=20s?= =?UTF-8?q?chedule?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/v12.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/v12.yml b/.github/workflows/v12.yml index 5cbdfb0..b187c45 100644 --- a/.github/workflows/v12.yml +++ b/.github/workflows/v12.yml @@ -1,5 +1,8 @@ name: Publish GraphIP Postgres Image [12] -on: [push] +on: + push: + schedule: + - cron: '0 1 * * wed' # every wednesday @ 01:00 jobs: build: runs-on: ubuntu-latest From 1d7defc010f99c04112e71363d9105a2e0fb54af Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Wed, 9 Dec 2020 07:27:02 +0000 Subject: [PATCH 13/19] =?UTF-8?q?=F0=9F=93=A6=20use=20specific=20build=20i?= =?UTF-8?q?mage=20in=20workflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/v12.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/v12.yml b/.github/workflows/v12.yml index b187c45..fc5e3c8 100644 --- a/.github/workflows/v12.yml +++ b/.github/workflows/v12.yml @@ -5,7 +5,7 @@ on: - cron: '0 1 * * wed' # every wednesday @ 01:00 jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@master - name: Publish to Registry From 59fefc63280d5a5ecaccf99f4d8b6424cb6f21ab Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Tue, 29 Dec 2020 12:18:58 +0000 Subject: [PATCH 14/19] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20add=20scheduled=20wo?= =?UTF-8?q?rkflows=20for=20other=20branches?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/v11.yml | 21 +++++++++++++++++++++ .github/workflows/v13.yml | 22 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 .github/workflows/v11.yml create mode 100644 .github/workflows/v13.yml diff --git a/.github/workflows/v11.yml b/.github/workflows/v11.yml new file mode 100644 index 0000000..118caf6 --- /dev/null +++ b/.github/workflows/v11.yml @@ -0,0 +1,21 @@ +name: Publish GraphIP Postgres Image [11] +on: + push: + schedule: + - cron: '20 1 * * wed' # every wednesday @ 01:20 +jobs: + build: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + with: + ref: 11 + - name: Publish to Registry + uses: elgohr/Publish-Docker-Github-Action@master + env: + MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }} + with: + name: graphip/postgres + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + buildargs: MAXMIND_LICENSE_KEY \ No newline at end of file diff --git a/.github/workflows/v13.yml b/.github/workflows/v13.yml new file mode 100644 index 0000000..8000e12 --- /dev/null +++ b/.github/workflows/v13.yml @@ -0,0 +1,22 @@ +name: Publish GraphIP Postgres Image [13] +on: + push: + schedule: + - cron: '10 1 * * wed' # every wednesday @ 01:10 +jobs: + build: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + with: + ref: 13 + - name: Publish to Registry + uses: elgohr/Publish-Docker-Github-Action@master + env: + MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }} + with: + name: graphip/postgres + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + buildargs: MAXMIND_LICENSE_KEY + tags: "latest,13" \ No newline at end of file From a4e83b51c210dcc87c4f24c6ade534b2ff995b05 Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Tue, 29 Dec 2020 12:26:37 +0000 Subject: [PATCH 15/19] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20update=20workflows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/v11.yml | 3 ++- .github/workflows/v12.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/v11.yml b/.github/workflows/v11.yml index 118caf6..af0d2cb 100644 --- a/.github/workflows/v11.yml +++ b/.github/workflows/v11.yml @@ -18,4 +18,5 @@ jobs: name: graphip/postgres username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - buildargs: MAXMIND_LICENSE_KEY \ No newline at end of file + buildargs: MAXMIND_LICENSE_KEY + tags: "11" \ No newline at end of file diff --git a/.github/workflows/v12.yml b/.github/workflows/v12.yml index fc5e3c8..08f85db 100644 --- a/.github/workflows/v12.yml +++ b/.github/workflows/v12.yml @@ -7,7 +7,7 @@ jobs: build: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 - name: Publish to Registry uses: elgohr/Publish-Docker-Github-Action@master env: From cb8bb211b804c5063a8a7e390eecde356465e145 Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Sat, 3 Apr 2021 19:35:36 +0100 Subject: [PATCH 16/19] =?UTF-8?q?=F0=9F=94=91=20LICENSE=20Update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index e3a7aaf..e12d49e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,9 @@ -MIT License +The PostgreSQL License -Copyright (c) 2020 AIGIS Services Ltd +Copyright (c) 2021, AIGIS Services Ltd -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +IN NO EVENT SHALL AIGIS Services Ltd BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF AIGIS Services Ltd HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +AIGIS Services Ltd SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND AIGIS Services Ltd HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. \ No newline at end of file From 13748aab2c4e496ba02d4a8f628156916ba44b02 Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Tue, 9 Aug 2022 13:11:02 +0100 Subject: [PATCH 17/19] =?UTF-8?q?=F0=9F=90=8B=20update=20Dockerfile=20?= =?UTF-8?q?=F0=9F=94=91=20update=20LICENSE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- LICENSE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8816101..5431b23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM postgres:12 -LABEL maintainer="AIGIS Services Ltd" +LABEL maintainer="Lotus Labs Ltd" ARG MAXMIND_LICENSE_KEY diff --git a/LICENSE b/LICENSE index e12d49e..c83093a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The PostgreSQL License -Copyright (c) 2021, AIGIS Services Ltd +Copyright (c) 2022, Lotus Labs Ltd Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies. From 5d6072dc9ae1b5e31a13432f336b9b3f0891182c Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Tue, 9 Aug 2022 13:16:28 +0100 Subject: [PATCH 18/19] =?UTF-8?q?=F0=9F=94=91=20update=20LICENSE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index c83093a..27474b1 100644 --- a/LICENSE +++ b/LICENSE @@ -4,6 +4,6 @@ Copyright (c) 2022, Lotus Labs Ltd Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies. -IN NO EVENT SHALL AIGIS Services Ltd BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF AIGIS Services Ltd HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +IN NO EVENT SHALL Lotus Labs Ltd BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF Lotus Labs Ltd HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -AIGIS Services Ltd SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND AIGIS Services Ltd HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. \ No newline at end of file +Lotus Labs Ltd SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND Lotus Labs Ltd HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. \ No newline at end of file From 3356662b6be64195408e9cd4628c3885029dbf18 Mon Sep 17 00:00:00 2001 From: Lars Gohr Date: Mon, 27 Mar 2023 22:22:32 +0200 Subject: [PATCH 19/19] Updated elgohr/Publish-Docker-Github-Action to a supported version (v5) --- .github/workflows/v11.yml | 2 +- .github/workflows/v12.yml | 2 +- .github/workflows/v13.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/v11.yml b/.github/workflows/v11.yml index af0d2cb..a8cc790 100644 --- a/.github/workflows/v11.yml +++ b/.github/workflows/v11.yml @@ -11,7 +11,7 @@ jobs: with: ref: 11 - name: Publish to Registry - uses: elgohr/Publish-Docker-Github-Action@master + uses: elgohr/Publish-Docker-Github-Action@v5 env: MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }} with: diff --git a/.github/workflows/v12.yml b/.github/workflows/v12.yml index 08f85db..4786efa 100644 --- a/.github/workflows/v12.yml +++ b/.github/workflows/v12.yml @@ -9,7 +9,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Publish to Registry - uses: elgohr/Publish-Docker-Github-Action@master + uses: elgohr/Publish-Docker-Github-Action@v5 env: MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }} with: diff --git a/.github/workflows/v13.yml b/.github/workflows/v13.yml index 8000e12..bc16252 100644 --- a/.github/workflows/v13.yml +++ b/.github/workflows/v13.yml @@ -11,7 +11,7 @@ jobs: with: ref: 13 - name: Publish to Registry - uses: elgohr/Publish-Docker-Github-Action@master + uses: elgohr/Publish-Docker-Github-Action@v5 env: MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }} with: