Merge remote-tracking branch 'github/master' into proxyprotocol

scripts/ci/frontend-build

@@ -1,14 +1,14 @@
 #!/bin/bash -e
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-. "$DIR/.common.sh"
+. "$DIR/../.common.sh"
 
-DOCKER_IMAGE=nginxproxymanager/nginx-full:certbot-node
+DOCKER_IMAGE=jc21/nginx-full:certbot-node
 
 # Ensure docker exists
 if hash docker 2>/dev/null; then
 	docker pull "${DOCKER_IMAGE}"
-	cd "${DIR}/.."
+	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"
 	echo -e "${BLUE}❯ ${GREEN}Building Frontend Complete${RESET}"

scripts/ci/test-and-build

@@ -0,0 +1,23 @@
+#!/bin/bash -e
+
+DOCKER_IMAGE=jc21/nginx-full:certbot-node
+docker pull "${DOCKER_IMAGE}"
+
+# Test
+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'
+
+# Build
+docker build --pull --no-cache --squash --compress \
+	-t "${IMAGE}:ci-${BUILD_NUMBER}" \
+	-f docker/Dockerfile \
+	--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')" \
+	.

scripts/install-s6

@@ -1,34 +0,0 @@
-#!/bin/bash -e
-
-# Note: This script is designed to be run inside a Docker Build for a container
-
-CYAN='\E[1;36m'
-YELLOW='\E[1;33m'
-BLUE='\E[1;34m'
-GREEN='\E[1;32m'
-RESET='\E[0m'
-
-S6_OVERLAY_VERSION=1.22.1.0
-TARGETPLATFORM=$1
-
-# Determine the correct binary file for the architecture given
-case $TARGETPLATFORM in
-	linux/arm64)
-		S6_ARCH=aarch64
-		;;
-
-	linux/arm/v7)
-		S6_ARCH=armhf
-		;;
-
-	*)
-		S6_ARCH=amd64
-		;;
-esac
-
-echo -e "${BLUE}❯ ${CYAN}Installing S6-overlay v${S6_OVERLAY_VERSION} for ${YELLOW}${TARGETPLATFORM} (${S6_ARCH})${RESET}"
-
-curl -L -o "/tmp/s6-overlay-${S6_ARCH}.tar.gz" "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.gz" \
-	&& tar -xzf "/tmp/s6-overlay-${S6_ARCH}.tar.gz" -C /
-
-echo -e "${BLUE}❯ ${GREEN}S6-overlay install Complete${RESET}"