Improved folder structure in line with NGINX OAuth Proxy

curityio · Sep 4, 2024 · 5ba55e5 · 5ba55e5
1 parent 8eeaaeb
commit 5ba55e5
Show file tree

Hide file tree

Showing 31 changed files with 6 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -59,4 +59,4 @@ nginx-*/
 t/servroot
 response.txt
 valgrind-results.txt
-log.txt
+log.txt
diff --git a/Makefile b/Makefile
@@ -20,10 +20,10 @@ clean:
 	rm -rf .build.info nginx-$(NGINX_VERSION) nginx-$(NGINX_VERSION).tar.gz* t/servroot
 
 test: all
-	@bash -c 'NGINX_SRC_DIR="$(NGINX_SRC_DIR)" ./resources/test/run.sh'
+	@bash -c 'NGINX_SRC_DIR="$(NGINX_SRC_DIR)" ./testing/test/run.sh'
 
-memorytest:
-	@bash -c './resources/memorytest/run.sh'
+integration:
+	@bash -c './testing/integration/run.sh'
 
 .build.info $(NGINX_SRC_DIR)/Makefile:
 	$(error You need to run the configure script in the root of this directory before building the source)
diff --git a/build.sh b/build.sh
@@ -62,7 +62,7 @@ docker build --no-cache -t nginx-module-builder \
   --build-arg NGINX_VERSION="$NGINX_VERSION" \
   --build-arg NGINX_DEBUG=n \
   --build-arg DYNAMIC_MODULE=Y \
-  -f dockerfiles/$LINUX_DISTRO.Dockerfile .
+  -f builders/$LINUX_DISTRO.Dockerfile .
 if [ $? -ne 0 ]; then
   echo "Docker build problem encountered for OS $LINUX_DISTRO and NGINX $NGINX_VERSION"
   exit 1

diff --git a/dockerfiles/alpine.Dockerfile → builders/alpine.Dockerfile b/dockerfiles/alpine.Dockerfile → builders/alpine.Dockerfile
diff --git a/dockerfiles/amazon2.Dockerfile → builders/amazon2.Dockerfile b/dockerfiles/amazon2.Dockerfile → builders/amazon2.Dockerfile
diff --git a/dockerfiles/amazon2023.Dockerfile → builders/amazon2023.Dockerfile b/dockerfiles/amazon2023.Dockerfile → builders/amazon2023.Dockerfile
diff --git a/dockerfiles/centosstream9.Dockerfile → builders/centosstream9.Dockerfile b/dockerfiles/centosstream9.Dockerfile → builders/centosstream9.Dockerfile
diff --git a/dockerfiles/debian11.Dockerfile → builders/debian11.Dockerfile b/dockerfiles/debian11.Dockerfile → builders/debian11.Dockerfile
diff --git a/dockerfiles/debian12.Dockerfile → builders/debian12.Dockerfile b/dockerfiles/debian12.Dockerfile → builders/debian12.Dockerfile
diff --git a/dockerfiles/ubuntu20.Dockerfile → builders/ubuntu20.Dockerfile b/dockerfiles/ubuntu20.Dockerfile → builders/ubuntu20.Dockerfile
diff --git a/dockerfiles/ubuntu22.Dockerfile → builders/ubuntu22.Dockerfile b/dockerfiles/ubuntu22.Dockerfile → builders/ubuntu22.Dockerfile
diff --git a/dockerfiles/ubuntu24.Dockerfile → builders/ubuntu24.Dockerfile b/dockerfiles/ubuntu24.Dockerfile → builders/ubuntu24.Dockerfile
diff --git a/resources/curity-test-config.xml → testing/curity-test-config.xml b/resources/curity-test-config.xml → testing/curity-test-config.xml
diff --git a/resources/memorytest/alpine/Dockerfile → testing/integration/alpine/Dockerfile b/resources/memorytest/alpine/Dockerfile → testing/integration/alpine/Dockerfile
diff --git a/resources/memorytest/amazon2/Dockerfile → testing/integration/amazon2/Dockerfile b/resources/memorytest/amazon2/Dockerfile → testing/integration/amazon2/Dockerfile
diff --git a/resources/memorytest/amazon2/nginx.repo → testing/integration/amazon2/nginx.repo b/resources/memorytest/amazon2/nginx.repo → testing/integration/amazon2/nginx.repo
diff --git a/resources/memorytest/amazon2023/Dockerfile → testing/integration/amazon2023/Dockerfile b/resources/memorytest/amazon2023/Dockerfile → testing/integration/amazon2023/Dockerfile
diff --git a/resources/memorytest/amazon2023/nginx.repo → testing/integration/amazon2023/nginx.repo b/resources/memorytest/amazon2023/nginx.repo → testing/integration/amazon2023/nginx.repo
diff --git a/...urces/memorytest/centosstream9/Dockerfile → testing/integration/centosstream9/Dockerfile b/...urces/memorytest/centosstream9/Dockerfile → testing/integration/centosstream9/Dockerfile
diff --git a/...urces/memorytest/centosstream9/nginx.repo → testing/integration/centosstream9/nginx.repo b/...urces/memorytest/centosstream9/nginx.repo → testing/integration/centosstream9/nginx.repo
diff --git a/resources/memorytest/debian11/Dockerfile → testing/integration/debian11/Dockerfile b/resources/memorytest/debian11/Dockerfile → testing/integration/debian11/Dockerfile
diff --git a/resources/memorytest/debian12/Dockerfile → testing/integration/debian12/Dockerfile b/resources/memorytest/debian12/Dockerfile → testing/integration/debian12/Dockerfile
diff --git a/resources/memorytest/docker-compose.yaml → testing/integration/docker-compose.yaml b/resources/memorytest/docker-compose.yaml → testing/integration/docker-compose.yaml
diff --git a/resources/memorytest/nginx.conf → testing/integration/nginx.conf b/resources/memorytest/nginx.conf → testing/integration/nginx.conf
diff --git a/resources/memorytest/run.sh → testing/integration/run.sh b/resources/memorytest/run.sh → testing/integration/run.sh
diff --git a/resources/memorytest/ubuntu20/Dockerfile → testing/integration/ubuntu20/Dockerfile b/resources/memorytest/ubuntu20/Dockerfile → testing/integration/ubuntu20/Dockerfile
diff --git a/resources/memorytest/ubuntu22/Dockerfile → testing/integration/ubuntu22/Dockerfile b/resources/memorytest/ubuntu22/Dockerfile → testing/integration/ubuntu22/Dockerfile
diff --git a/resources/memorytest/ubuntu24/Dockerfile → testing/integration/ubuntu24/Dockerfile b/resources/memorytest/ubuntu24/Dockerfile → testing/integration/ubuntu24/Dockerfile
diff --git a/resources/localhost/nginx.conf → testing/localhost/nginx.conf b/resources/localhost/nginx.conf → testing/localhost/nginx.conf
diff --git a/resources/test/docker-compose.yaml → testing/test/docker-compose.yaml b/resources/test/docker-compose.yaml → testing/test/docker-compose.yaml
diff --git a/resources/test/run.sh → testing/test/run.sh b/resources/test/run.sh → testing/test/run.sh
@@ -48,5 +48,5 @@ PATH="$NGINX_SRC_DIR/objs:$PATH" prove -v -f t/
 #
 # Free resources
 #
-cd resources/test
+cd testing/test
 docker-compose down