From 4ca0a8c77e893718eafb2a27ac705d5bd84c9795 Mon Sep 17 00:00:00 2001 From: Leo Date: Thu, 26 Mar 2020 02:51:38 +0000 Subject: [PATCH 1/6] Tag 4.1.4-ubuntu-16.04 as latest --- .github/workflows/ci-release.yml | 2 ++ generate/definitions/VARIANTS.ps1 | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index d1deb2d..b3f19d8 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -52,10 +52,12 @@ jobs: -t "${DOCKERHUB_REGISTRY_USER}/${CI_PROJECT_NAME}:${VARIANT_TAG}" \ -t "${DOCKERHUB_REGISTRY_USER}/${CI_PROJECT_NAME}:${VARIANT_TAG_WITH_REF}" \ -t "${DOCKERHUB_REGISTRY_USER}/${CI_PROJECT_NAME}:${VARIANT_TAG_WITH_REF_AND_SHA_SHORT}" \ + -t "${DOCKERHUB_REGISTRY_USER}/${CI_PROJECT_NAME}:latest" \ "${VARIANT_BUILD_DIR}" docker push "${DOCKERHUB_REGISTRY_USER}/${CI_PROJECT_NAME}:${VARIANT_TAG}" docker push "${DOCKERHUB_REGISTRY_USER}/${CI_PROJECT_NAME}:${VARIANT_TAG_WITH_REF}" docker push "${DOCKERHUB_REGISTRY_USER}/${CI_PROJECT_NAME}:${VARIANT_TAG_WITH_REF_AND_SHA_SHORT}" + docker push "${DOCKERHUB_REGISTRY_USER}/${CI_PROJECT_NAME}:latest" - name: Clean-up run: docker logout if: always() \ No newline at end of file diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1 index f9d288e..116dde3 100644 --- a/generate/definitions/VARIANTS.ps1 +++ b/generate/definitions/VARIANTS.ps1 @@ -9,6 +9,7 @@ $VARIANTS = @( VARNISH_DASHBOARD_COMMIT = "e2cc1c854941c9fac18bdfedba2819fa766a5549" } tag = '4.1.4-ubuntu-16.04' + tag_as_latest = $true } ) From 06e68228d5e679be064d528578ed4bc1685193a8 Mon Sep 17 00:00:00 2001 From: Leo Date: Thu, 26 Mar 2020 02:53:51 +0000 Subject: [PATCH 2/6] Update LICENSE --- LICENSE | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 201 insertions(+), 21 deletions(-) diff --git a/LICENSE b/LICENSE index 51154e8..7ae7c0d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,201 @@ -MIT License - -Copyright (c) 2019 The Oh Brothers - -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. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2019 The Oh Brothers + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From 9302a8ae0d95c72a5879bc30b9f1e065f453e817 Mon Sep 17 00:00:00 2001 From: Leo Date: Mon, 30 Mar 2020 11:37:51 +0000 Subject: [PATCH 3/6] Update readme with 'latest' tag --- README.md | 4 ++-- generate/templates/README.md.ps1 | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ff71235..9bed04c 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ It also includes the [Enhanced Varnish Dashboard](https://github.com/brandonwamb ## Tags | Tags | -|:-------:| -| `:4.1.4-ubuntu-16.04` | +|:-------:| +| `:4.1.4-ubuntu-16.04`, `:latest` | ## Quick start diff --git a/generate/templates/README.md.ps1 b/generate/templates/README.md.ps1 index 27026f8..dffb846 100644 --- a/generate/templates/README.md.ps1 +++ b/generate/templates/README.md.ps1 @@ -11,10 +11,22 @@ It also includes the [Enhanced Varnish Dashboard](https://github.com/brandonwamb ## Tags | Tags | -|:-------:| $( $VARIANTS | % { -"`n| ``:$( $_['tag'] )`` |" -}) +|:-------:| +$( +($VARIANTS | % { + if ( $_['tag_as_latest'] ) { +@" +| ``:$( $_['tag'] )``, ``:latest`` | + +"@ + }else { +@" +| ``:$( $_['tag'] )`` | +"@ + } +}) -join '' +) "@ + @' ## Quick start From a259226a3bf595a1d9c151b9b3ec3db20d9a8766 Mon Sep 17 00:00:00 2001 From: Leonard Jonathan Oh Date: Mon, 11 Jan 2021 07:55:19 +0000 Subject: [PATCH 4/6] Fix: Fix github actions badge in readme --- README.md | 2 +- generate/templates/README.md.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9bed04c..caf4894 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # docker-varnish-agent -[![github-actions](https://github.com/theohbrothers/docker-varnish-agent/workflows/build/badge.svg)](https://github.com/theohbrothers/docker-varnish-agent/actions) +[![github-actions](https://github.com/theohbrothers/docker-varnish-agent/workflows/ci-master-pr/badge.svg)](https://github.com/theohbrothers/docker-varnish-agent/actions) [![docker-image-size](https://img.shields.io/microbadger/image-size/theohbrothers/docker-varnish-agent/latest)](https://hub.docker.com/r/theohbrothers/docker-varnish-agent) [![docker-image-layers](https://img.shields.io/microbadger/layers/theohbrothers/docker-varnish-agent/latest)](https://hub.docker.com/r/theohbrothers/docker-varnish-agent) diff --git a/generate/templates/README.md.ps1 b/generate/templates/README.md.ps1 index dffb846..e703909 100644 --- a/generate/templates/README.md.ps1 +++ b/generate/templates/README.md.ps1 @@ -1,7 +1,7 @@ @" # docker-varnish-agent -[![github-actions](https://github.com/theohbrothers/docker-varnish-agent/workflows/build/badge.svg)](https://github.com/theohbrothers/docker-varnish-agent/actions) +[![github-actions](https://github.com/theohbrothers/docker-varnish-agent/workflows/ci-master-pr/badge.svg)](https://github.com/theohbrothers/docker-varnish-agent/actions) [![docker-image-size](https://img.shields.io/microbadger/image-size/theohbrothers/docker-varnish-agent/latest)](https://hub.docker.com/r/theohbrothers/docker-varnish-agent) [![docker-image-layers](https://img.shields.io/microbadger/layers/theohbrothers/docker-varnish-agent/latest)](https://hub.docker.com/r/theohbrothers/docker-varnish-agent) From 3fb6fc75501e80f74b200fb38da0eb5d7cbe9b3a Mon Sep 17 00:00:00 2001 From: Leonard Jonathan Oh Date: Mon, 15 Feb 2021 19:14:00 +0000 Subject: [PATCH 5/6] Docs: Rename Quick start section title to Usage in readme --- README.md | 4 ++-- generate/templates/README.md.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index caf4894..84c9c5b 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ It also includes the [Enhanced Varnish Dashboard](https://github.com/brandonwamb |:-------:| | `:4.1.4-ubuntu-16.04`, `:latest` | -## Quick start +## Usage -- An example `docker-compose.yml` is included demonstrating how to use this image with an separate Varnish image (e.g. [`varnish-alpine-docker`](https://github.com/thiagofigueiro/varnish-alpine-docker)). +An example `docker-compose.yml` is included demonstrating how to use this image with an separate Varnish image (e.g. [`varnish-alpine-docker`](https://github.com/thiagofigueiro/varnish-alpine-docker)). ## Environment variables diff --git a/generate/templates/README.md.ps1 b/generate/templates/README.md.ps1 index e703909..b02c198 100644 --- a/generate/templates/README.md.ps1 +++ b/generate/templates/README.md.ps1 @@ -29,9 +29,9 @@ $( ) "@ + @' -## Quick start +## Usage -- An example `docker-compose.yml` is included demonstrating how to use this image with an separate Varnish image (e.g. [`varnish-alpine-docker`](https://github.com/thiagofigueiro/varnish-alpine-docker)). +An example `docker-compose.yml` is included demonstrating how to use this image with an separate Varnish image (e.g. [`varnish-alpine-docker`](https://github.com/thiagofigueiro/varnish-alpine-docker)). ## Environment variables From 5c036f13dc3c437a4ed410f9d0a842bb63ee5fe9 Mon Sep 17 00:00:00 2001 From: Leonard Jonathan Oh Date: Mon, 15 Feb 2021 19:14:27 +0000 Subject: [PATCH 6/6] Docs: Update readme tags table with Dockerfile build contexts links --- README.md | 6 +++--- generate/templates/README.md.ps1 | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 84c9c5b..0fa95fe 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ It also includes the [Enhanced Varnish Dashboard](https://github.com/brandonwamb ## Tags -| Tags | -|:-------:| -| `:4.1.4-ubuntu-16.04`, `:latest` | +| Tag | Dockerfile Build Context | +|:-------:|:---------:| +| `:4.1.4-ubuntu-16.04`, `:latest` | [View](variants/4.1.4-ubuntu-16.04 ) | ## Usage diff --git a/generate/templates/README.md.ps1 b/generate/templates/README.md.ps1 index b02c198..3b227af 100644 --- a/generate/templates/README.md.ps1 +++ b/generate/templates/README.md.ps1 @@ -10,18 +10,18 @@ It also includes the [Enhanced Varnish Dashboard](https://github.com/brandonwamb ## Tags -| Tags | -|:-------:| +| Tag | Dockerfile Build Context | +|:-------:|:---------:| $( ($VARIANTS | % { if ( $_['tag_as_latest'] ) { @" -| ``:$( $_['tag'] )``, ``:latest`` | +| ``:$( $_['tag'] )``, ``:latest`` | [View](variants/$( $_['tag'] ) ) | "@ }else { @" -| ``:$( $_['tag'] )`` | +| ``:$( $_['tag'] )`` | [View](variants/$( $_['tag'] ) ) | "@ }