Merge branch 'v3' into add-selinux-support

Author: dhurley

.github/workflows/release-branch.yml

@@ -38,7 +38,7 @@ on:
       uploadUrl:
         description: 'Location to publish packages to'
         required: false
-        default: "up-ap.nginx.com"
+        default: "https://up-ap.nginx.com"
   workflow_call:
     inputs:
       githubRelease:
@@ -67,10 +67,11 @@ on:
         required: true
       uploadUrl:
         type: string
-        default: "up-ap.nginx.com"
+        default: "https://up-ap.nginx.com"
 
 env:
   NFPM_VERSION: 'v2.35.3'
+  GOPROXY: "https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@azr.artifactory.f5net.com/artifactory/api/go/f5-nginx-go-dev"
 
 defaults:
   run:

Makefile

@@ -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) \