Merge branch 'v3' into added-manifest-file

Author: RRashmit

.github/workflows/release-branch.yml

@@ -35,6 +35,10 @@ on:
         description: 'Release branch to build & publish from'
         required: true
         type: string
+      uploadUrl:
+        description: 'Location to publish packages to'
+        required: false
+        default: "https://up-ap.nginx.com"
   workflow_call:
     inputs:
       githubRelease:
@@ -61,6 +65,9 @@ on:
       releaseBranch:
         type: string
         required: true
+      uploadUrl:
+        type: string
+        default: "https://up-ap.nginx.com"
 
 env:
   NFPM_VERSION: 'v2.35.3'
@@ -222,7 +229,7 @@ jobs:
 
   upload-packages:
     name: Upload packages
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-22.04-amd64
     needs: [vars,release-draft,tag-release]
     permissions:
       id-token: write
@@ -314,7 +321,7 @@ jobs:
         if: ${{ inputs.publishPackages == true }}
         env:
           TOKEN: ${{ steps.idtoken.outputs.id_token }}
-          UPLOAD_URL: ${{ secrets.UPLOAD_URL }}
+          UPLOAD_URL: ${{ inputs.uploadUrl }}
         run: |
           make release
 

.nfpm.yaml

@@ -18,8 +18,20 @@ contents:
       mode: 0640
   - src: ./scripts/packages/nginx-agent.service
     dst: /etc/systemd/system/nginx-agent.service
+  - src: ./scripts/packages/nginx-agent.openrc
+    dst: /etc/init.d/nginx-agent
+    packager: apk
   - src: ./scripts/nginx-agent.logrotate
     dst: /etc/logrotate.d/nginx-agent
+  - src: ./scripts/selinux/nginx_agent_selinux.8
+    dst: /usr/share/man/man8/nginx_agent_selinux.8
+    packager: rpm
+  - src: ./scripts/selinux/nginx_agent.if
+    dst: /usr/share/selinux/devel/include/contrib/nginx_agent.if
+    packager: rpm
+  - src: ./scripts/selinux/nginx_agent.pp
+    dst: /usr/share/selinux/packages/nginx_agent.pp
+    packager: rpm
   - dst: /var/log/nginx-agent
     type: dir
   - dst: /var/lib/nginx-agent
@@ -38,6 +50,8 @@ rpm:
 apk:
   signature:
     key_file: ".key.rsa"
+  scripts:
+    postupgrade: "./scripts/packages/postupgrade.sh"
 scripts:
   preinstall: "./scripts/packages/preinstall.sh"
   postinstall: "./scripts/packages/postinstall.sh"

Makefile

@@ -22,7 +22,7 @@ GOBIN 	?= $$(go env GOPATH)/bin
 # | redhatenterprise | 8, 9                                  	 |                                                                |
 # | rockylinux       | 8, 9                                      |                                                                |
 # | almalinux        | 8, 9                                      |                                                                |
-# | alpine           | 3.17, 3.18, 3.19, 3.20                    |                                                                |
+# | alpine           | 3.17, 3.18, 3.19, 3.20, 3.21              |                                                                |
 # | oraclelinux      | 8, 9                                		 |                                                                |
 # | suse             | sles12sp5, sle15                          |                                                                |
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -205,7 +205,7 @@ build-test-nginx-plus-and-nap-image:
 .PHONY: build-test-plus-image
 build-test-plus-image:
 	$(CONTAINER_BUILDENV) $(CONTAINER_CLITOOL) build -t nginx_plus_$(IMAGE_TAG) . \
-		--no-cache -f ./test/docker/nginx-plus/deb/Dockerfile \
+		--no-cache -f ./test/docker/nginx-plus/$(CONTAINER_OS_TYPE)/Dockerfile \
 		--secret id=nginx-crt,src=$(CERTS_DIR)/nginx-repo.crt \
 		--secret id=nginx-key,src=$(CERTS_DIR)/nginx-repo.key \
 		--build-arg PACKAGE_NAME=$(PACKAGE_NAME) \
@@ -216,7 +216,7 @@ build-test-plus-image:
 .PHONY: build-test-oss-image
 build-test-oss-image:
 	$(CONTAINER_BUILDENV) $(CONTAINER_CLITOOL) build -t nginx_oss_$(IMAGE_TAG) . \
-		--no-cache -f ./test/docker/nginx-oss/deb/Dockerfile \
+		--no-cache -f ./test/docker/nginx-oss/$(CONTAINER_OS_TYPE)/Dockerfile \
 		--target install-agent-local \
 		--build-arg PACKAGE_NAME=$(PACKAGE_NAME) \
 		--build-arg PACKAGES_REPO=$(OSS_PACKAGES_REPO) \

Makefile.packaging

@@ -22,7 +22,7 @@ REDHAT_ARCHS        ?= aarch64 x86_64
 ROCKY_VERSIONS      ?= rocky-8 rocky-9
 ROCKY_ARCHS         ?= aarch64 x86_64
 FREEBSD_DISTROS     ?= "FreeBSD:13:amd64" "FreeBSD:14:amd64" 
-APK_VERSIONS        ?= 3.17 3.18 3.19 3.20
+APK_VERSIONS        ?= 3.17 3.18 3.19 3.20 3.21
 APK_ARCHS           ?= aarch64 x86_64
 ALMA_VERSIONS       ?= almalinux-8 almalinux-9
 ALMA_ARCHS          ?= aarch64 x86_64
@@ -158,7 +158,7 @@ package: gpg-key $(PACKAGES_DIR) $(GITHUB_PACKAGES_DIR) $(AZURE_PACKAGES_DIR) ##
 		GOWORK=off CGO_ENABLED=0 GOARCH=$${goarch} GOOS=linux go build -pgo=auto -ldflags=${LDFLAGS} -o $(BINARY_PATH) $(PROJECT_DIR)/$(PROJECT_FILE); \
     	for version in $(APK_VERSIONS); do \
 			if [ ! -d "$(PACKAGES_DIR)/apk/v$${version}/$${arch}" ]; then mkdir -p $(PACKAGES_DIR)/apk/v$${version}/$${arch}; fi; \
-			VERSION=$(PACKAGE_VERSION) ARCH=$${arch} nfpm pkg --config .nfpm.yaml --packager apk --target $(PACKAGES_DIR)/apk/v$${version}/$${arch}/${PACKAGE_PREFIX}-$(APK_PACKAGE_VERSION).apk; \
+			VERSION=$(APK_PACKAGE_VERSION) ARCH=$${arch} nfpm pkg --config .nfpm.yaml --packager apk --target $(PACKAGES_DIR)/apk/v$${version}/$${arch}/${PACKAGE_PREFIX}-$(APK_PACKAGE_VERSION).apk; \
 			cp $(PACKAGES_DIR)/apk/v$${version}/$${arch}/${PACKAGE_PREFIX}-$(APK_PACKAGE_VERSION).apk ${GITHUB_PACKAGES_DIR}/${PACKAGE_PREFIX}-$(APK_PACKAGE_VERSION)-v$${version}-$${arch}.apk; \
 			cp $(PACKAGES_DIR)/apk/v$${version}/$${arch}/${PACKAGE_PREFIX}-$(APK_PACKAGE_VERSION).apk ${AZURE_PACKAGES_DIR}/${PACKAGE_PREFIX}-$(APK_PACKAGE_VERSION)-v$${version}-$${arch}.apk; \
 		done; \