Update build files

Makefile

@@ -4,7 +4,7 @@ TARGET ?= local
 
 export DOCKER_BUILDKIT = 1
 
-all: amazon centos7 centos8 ubuntu-xenial amazon2 ubuntu-bionic ubuntu-focal ubuntu-groovy
+all: amazon amazon2 centos7 centos8 debian
 
 .PHONY: test
 test:
@@ -35,21 +35,9 @@ centos8: build
 	docker build -t centos8-builder --target ${TARGET} --build-arg CONTAINER_VERSION=centos:8 --build-arg OS_TYPE=rpm_based -f build/Dockerfile .
 	docker run --rm -v $(shell pwd)/build/package/rpm:/rpm -v $(shell pwd)/build_output:/build_output centos8-builder
 
-ubuntu-xenial: build
-	docker build -t ubuntu-xenial-builder --target ${TARGET} --build-arg CONTAINER_VERSION=ubuntu:xenial --build-arg OS_TYPE=deb_based -f build/Dockerfile .
-	docker run --rm -v $(shell pwd)/build/package/debian:/debian -v $(shell pwd)/build_output:/build_output ubuntu-xenial-builder
-
-ubuntu-bionic: build
-	docker build -t ubuntu-bionic-builder --target ${TARGET} --build-arg CONTAINER_VERSION=ubuntu:bionic --build-arg OS_TYPE=deb_based -f build/Dockerfile .
-	docker run --rm -v $(shell pwd)/build/package/debian:/debian -v $(shell pwd)/build_output:/build_output ubuntu-bionic-builder
-
-ubuntu-focal: build
-	docker build -t ubuntu-focal-builder --target ${TARGET} --build-arg CONTAINER_VERSION=ubuntu:focal --build-arg OS_TYPE=deb_based -f build/Dockerfile .
-	docker run --rm -v $(shell pwd)/build/package/debian:/debian -v $(shell pwd)/build_output:/build_output ubuntu-focal-builder
-
-ubuntu-groovy: build
-	docker build -t ubuntu-groovy-builder --target ${TARGET} --build-arg CONTAINER_VERSION=ubuntu:groovy --build-arg OS_TYPE=deb_based -f build/Dockerfile .
-	docker run --rm -v $(shell pwd)/build/package/debian:/debian -v $(shell pwd)/build_output:/build_output ubuntu-groovy-builder
+debian: build
+	docker build -t debian-builder --target ${TARGET} --build-arg CONTAINER_VERSION=debian:buster --build-arg OS_TYPE=deb_based -f build/Dockerfile .
+	docker run --rm -v $(shell pwd)/build/package/debian:/debian -v $(shell pwd)/build_output:/build_output debian-builder
 
 .PHONY: clean
 clean:

README.md

@@ -43,7 +43,7 @@ Below you will find documentation on how to use nginx-asg-sync.
 
 We provide packages for the following operating systems:
 
-* Ubuntu: 16.04 (Xenial), 18.04 (Bionic), 20.04 (Focal), 20.10 (Groovy)
+* Ubuntu/Debian: 16.04 and later, Debian 9/10
 * CentOS/RHEL: 7, 8
 * Amazon Linux: 1, 2
 
@@ -56,7 +56,7 @@ Support for other operating systems can be added.
     * For the latest source code from the master branch, build a software package by following [these instructions](#building-a-software-package).
 2. Install the package:
     * For Amazon Linux or CentOS/RHEL, run: `$ sudo rpm -i <package-name>.rpm`
-    * For Ubuntu, run: `$ sudo dpkg -i <package-name>.deb`
+    * For Ubuntu or Debian, run: `$ sudo dpkg -i <package-name>.deb`
 
 ### NGINX Plus Configuration
 
@@ -150,7 +150,7 @@ nginx-asg-sync runs as a system service and supports the start/stop/restart comm
 
 For Amazon Linux 1, run: `$ sudo start|stop|restart nginx-asg-sync`
 
-For Ubuntu 16.04, 18.04, 20.04, 20.10, CentOS7/RHEL7, CentOS8/RHEL8 and Amazon Linux 2, run: `$ sudo service nginx-asg-sync start|stop|restart`
+For Ubuntu >= 16.04, Debian 9/10, CentOS7/RHEL7, CentOS8/RHEL8 and Amazon Linux 2, run: `$ sudo service nginx-asg-sync start|stop|restart`
 
 ## Troubleshooting
 
@@ -169,14 +169,11 @@ where `<os>` is the target OS. The following values are allowed:
 * `amazon2` for Amazon Linux 2
 * `centos7` for CentOS7/RHEL7
 * `centos8` for CentOS8/RHEL8
-* `ubuntu-xenial` for Ubuntu 16.04
-* `ubuntu-bionic` for Ubuntu 18.04
-* `ubuntu-focal` for Ubuntu 20.04
-* `ubuntu-groovy` for Ubuntu 20.10
+* `debian` for Ubuntu >= 16.04 and Debian 9/10
 
 by default the nginx-asg-sync binary will be built locally, to build it inside a Docker container add the `TARGET` parameter to `make`, for example:
 
-`$ make ubuntu-focal TARGET=container`
+`$ make debian TARGET=container`
 
 If you run make without any arguments, it will build software packages for all supported OSes.
 

build/Dockerfile

@@ -1,6 +1,5 @@
-ARG CONTAINER_VERSION=ubuntu:groovy
+ARG CONTAINER_VERSION=debian:buster
 ARG OS_TYPE=deb_based
-ARG PACKAGE_VERSION=0.4-1
 
 FROM golang:1.16-alpine AS builder
 WORKDIR /go/src/github.com/nginxinc/nginx-asg-sync/cmd/sync
@@ -21,14 +20,9 @@ ENTRYPOINT ["/build.sh"]
 
 FROM ${CONTAINER_VERSION} as deb_based
 
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install debhelper dh-systemd -y
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install build-essential debhelper-compat -y
 ADD build/package/builders/deb_based/build.sh /
 
-ARG PACKAGE_VERSION
-ARG CONTAINER_VERSION
-ENV PACKAGE_VERSION=${PACKAGE_VERSION}
-ENV CONTAINER_VERSION=${CONTAINER_VERSION}
-
 ENTRYPOINT ["/build.sh"]
 
 #---------------------------------------------------------------------------------------------

build/package/builders/deb_based/build.sh

@@ -1,15 +1,8 @@
 #!/bin/bash
 
-package_name=nginx-asg-sync-${PACKAGE_VERSION}
-
-export SYSTEMD='--with=systemd'
-export OS_VERSION=${CONTAINER_VERSION#*:}
-
-mkdir -p ~/${package_name}/
-cp -r /debian ~/${package_name}/
-cd ~/${package_name}/
-sed -i "s/%%CODENAME%%/${OS_VERSION}/g" debian/changelog
-rm debian/nginx-asg-sync.upstart
+mkdir -p ~/nginx-asg-sync/
+cp -r /debian ~/nginx-asg-sync/
+cd ~/nginx-asg-sync/
 dpkg-buildpackage -us -uc
 cd ..
 mv *.deb /build_output/

build/package/debian/control

@@ -1,14 +1,14 @@
 Source: nginx-asg-sync
-Section: misc
+Section: contrib
 Priority: optional
 Maintainer: Michael Pleshakov <michael@nginx.com>
-Build-Depends: debhelper (>= 8.0.0)
-Standards-Version: 3.9.4
+Build-Depends: debhelper-compat (= 12)
+Standards-Version: 4.5.1
 Homepage: https://github.com/nginxinc/nginx-asg-sync
 
 Package: nginx-asg-sync
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: nginx-plus
 Description: NGINX Plus Integration with Cloud Autoscaling
   This package contains software that integrates NGINX Plus
   with AWS Auto Scaling groups and Azure Virtual Machine Scale Sets

build/package/debian/copyright

@@ -229,200 +229,6 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
- Includes the INI library (https://github.com/go-ini/ini) distributed under the following license:
-
- 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:
-
- You must give any other recipients of the Work or Derivative Works a copy of
- this License; and
- You must cause any modified files to carry prominent notices stating that You
- changed the files; and
- 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
- 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 [yyyy] [name of copyright owner]
-
-    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.
-
  Includes the A JMESPath implementation in Go library (https://github.com/jmespath/go-jmespath) distributed under the following license:
 
  Copyright 2015 James Saryerwinnie
@@ -438,51 +244,3 @@
  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.
-
- Includes the YAML support for the Go language library (https://github.com/go-yaml/yaml/tree/v2) distributed under the following license:
-
- Copyright 2011-2016 Canonical Ltd.
-
- 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.
-
- The following files were ported to Go from C files of libyaml, and thus
- are still covered by their original copyright and license:
-
-     apic.go
-     emitterc.go
-     parserc.go
-     readerc.go
-     scannerc.go
-     writerc.go
-     yamlh.go
-     yamlprivateh.go
-
- Copyright (c) 2006 Kirill Simonov
-
- 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.

build/package/debian/dirs

@@ -1,2 +1,3 @@
 /usr/sbin
 /etc/nginx
+/var/log/nginx-asg-sync