mirror of
				https://github.com/NginxProxyManager/nginx-proxy-manager.git
				synced 2025-10-31 07:43:33 +00:00 
			
		
		
		
	Use nginxproxymanager/nginx-full image base
which has been updated with bookworm, python 3.8, certbot 2.8.0 and node 20 Moved rootfs scripts as /bin is a symlink in bookworm
This commit is contained in:
		| @@ -3,14 +3,22 @@ | ||||
| DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" | ||||
| . "$DIR/../.common.sh" | ||||
|  | ||||
| DOCKER_IMAGE=jc21/nginx-full:certbot-node | ||||
| DOCKER_IMAGE=nginxproxymanager/nginx-full:certbot-node | ||||
|  | ||||
| # Ensure docker exists | ||||
| if hash docker 2>/dev/null; then | ||||
| 	docker pull "${DOCKER_IMAGE}" | ||||
| 	cd "${DIR}/../.." | ||||
| 	echo -e "${BLUE}❯ ${CYAN}Building Frontend ...${RESET}" | ||||
| 	docker run --rm -e CI=true -v "$(pwd)/frontend:/app/frontend" -v "$(pwd)/global:/app/global" -w /app/frontend "$DOCKER_IMAGE" sh -c "yarn install && yarn build && yarn build && chown -R $(id -u):$(id -g) /app/frontend" | ||||
|  | ||||
| 	docker run --rm \ | ||||
| 		-e CI=true \ | ||||
| 		-e NODE_OPTIONS=--openssl-legacy-provider \ | ||||
| 		-v "$(pwd)/frontend:/app/frontend" \ | ||||
| 		-v "$(pwd)/global:/app/global" \ | ||||
| 		-w /app/frontend "$DOCKER_IMAGE" \ | ||||
| 		sh -c "yarn install && yarn build && yarn build && chown -R $(id -u):$(id -g) /app/frontend" | ||||
|  | ||||
| 	echo -e "${BLUE}❯ ${GREEN}Building Frontend Complete${RESET}" | ||||
| else | ||||
| 	echo -e "${RED}❯ docker command is not available${RESET}" | ||||
|   | ||||
| @@ -1,23 +1,31 @@ | ||||
| #!/bin/bash -e | ||||
|  | ||||
| DOCKER_IMAGE=jc21/nginx-full:certbot-node | ||||
| DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" | ||||
| . "$DIR/../.common.sh" | ||||
|  | ||||
| DOCKER_IMAGE=nginxproxymanager/nginx-full:certbot-node | ||||
| docker pull "${DOCKER_IMAGE}" | ||||
|  | ||||
| # Test | ||||
| echo -e "${BLUE}❯ ${CYAN}Testing backend ...${RESET}" | ||||
| docker run --rm \ | ||||
| 	-v "$(pwd)/backend:/app" \ | ||||
| 	-v "$(pwd)/global:/app/global" \ | ||||
| 	-w /app \ | ||||
| 	"${DOCKER_IMAGE}" \ | ||||
| 	sh -c 'yarn install && yarn eslint . && rm -rf node_modules' | ||||
| echo -e "${BLUE}❯ ${GREEN}Testing Complete${RESET}" | ||||
|  | ||||
| # Build | ||||
| docker build --pull --no-cache --squash --compress \ | ||||
| echo -e "${BLUE}❯ ${CYAN}Building ...${RESET}" | ||||
| docker build --pull --no-cache --compress \ | ||||
| 	-t "${IMAGE}:ci-${BUILD_NUMBER}" \ | ||||
| 	-f docker/Dockerfile \ | ||||
| 	--progress=plain \ | ||||
| 	--build-arg TARGETPLATFORM=linux/amd64 \ | ||||
| 	--build-arg BUILDPLATFORM=linux/amd64 \ | ||||
| 	--build-arg BUILD_VERSION="${BUILD_VERSION}" \ | ||||
| 	--build-arg BUILD_COMMIT="${BUILD_COMMIT}" \ | ||||
| 	--build-arg BUILD_DATE="$(date '+%Y-%m-%d %T %Z')" \ | ||||
| 	. | ||||
| echo -e "${BLUE}❯ ${GREEN}Building Complete${RESET}" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user