update Dockerfile; update scripts.sh (TeslaGov#88)

Author: JoshMcCullough

Dockerfile

@@ -4,38 +4,44 @@ ARG SOURCE_HASH
 
 FROM debian:bullseye-slim as ngx_http_auth_jwt_builder_base
 LABEL stage=ngx_http_auth_jwt_builder
-RUN apt-get update &&\
-	apt-get install -y curl build-essential
-
-
+RUN <<`
+apt-get update
+apt-get install -y curl build-essential
+`
 FROM ngx_http_auth_jwt_builder_base as ngx_http_auth_jwt_builder_module
 LABEL stage=ngx_http_auth_jwt_builder
 ENV LD_LIBRARY_PATH=/usr/local/lib
 ARG NGINX_VERSION
-RUN set -x &&\
-	apt-get install -y libjwt-dev libjwt0 libjansson-dev libjansson4 libpcre2-dev zlib1g-dev libpcre3-dev &&\
-	mkdir -p /root/build/ngx-http-auth-jwt-module
+RUN <<`
+apt-get install -y libjwt-dev libjwt0 libjansson-dev libjansson4 libpcre2-dev zlib1g-dev libpcre3-dev
+mkdir -p /root/build/ngx-http-auth-jwt-module
+`
 WORKDIR /root/build/ngx-http-auth-jwt-module
 ARG SOURCE_HASH
 RUN echo "Source Hash: ${SOURCE_HASH}"
 ADD config ./
 ADD src/*.h src/*.c ./src/
 WORKDIR /root/build
-RUN set -x &&\
-  mkdir nginx &&\
-	curl -O http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz &&\
-	tar -xzf nginx-${NGINX_VERSION}.tar.gz --strip-components 1 -C nginx
+RUN <<`
+mkdir nginx
+curl -O http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
+tar -xzf nginx-${NGINX_VERSION}.tar.gz --strip-components 1 -C nginx
+`
 WORKDIR /root/build/nginx
-RUN ./configure --with-debug --with-compat --add-dynamic-module=../ngx-http-auth-jwt-module &&\
-	make modules
+RUN <<`
+./configure --with-debug --with-compat --add-dynamic-module=../ngx-http-auth-jwt-module
+make modules
+`
 
 
 FROM nginx:${NGINX_VERSION} AS ngx_http_auth_jwt_builder_nginx
 LABEL stage=
 RUN rm /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh /etc/nginx/conf.d/default.conf
-RUN apt-get update &&\
-	apt-get -y install libjansson4 libjwt0 &&\
-	cd /etc/nginx &&\
-	sed -ri '/pid\s+\/var\/run\/nginx\.pid;$/a load_module \/usr\/lib64\/nginx\/modules\/ngx_http_auth_jwt_module\.so;' nginx.conf
+RUN <<`
+apt-get update
+apt-get -y install libjansson4 libjwt0
+cd /etc/nginx
+sed -ri '/pid\s+\/var\/run\/nginx\.pid;$/a load_module \/usr\/lib64\/nginx\/modules\/ngx_http_auth_jwt_module\.so;' nginx.conf
+`
 LABEL maintainer="TeslaGov" email="[email protected]"
 COPY --from=ngx_http_auth_jwt_builder_module /root/build/nginx/objs/ngx_http_auth_jwt_module.so /usr/lib64/nginx/modules/

scripts.sh

@@ -28,42 +28,54 @@ build_module() {
 	printf "${BLUE}Building module...${NC}\n"
 	docker image build -t ${FULL_IMAGE_NAME}:latest -t ${FULL_IMAGE_NAME}:${NGINX_VERSION} ${dockerArgs} \
 		--build-arg NGINX_VERSION=${NGINX_VERSION} \
-		--build-arg SOURCE_HASH=${sourceHash} \.
+		--build-arg SOURCE_HASH=${sourceHash} .
 
 	if [ "$?" -ne 0 ]; then
 		printf "${RED}✘ Build failed ${NC}\n"
 	else
 		printf "${GREEN}✔ Successfully built NGINX module ${NC}\n"
 	fi
-
-	docker rmi -f $(docker images --filter=label=stage=ngx_http_auth_jwt_builder --quiet) 2> /dev/null || true
 }
 
 rebuild_module() {
+	clean_module
 	build_module --no-cache
 }
 
+clean_module() {
+	docker rmi -f $(docker images --filter=label=stage=ngx_http_auth_jwt_builder --quiet) 2> /dev/null || true
+}
+
 start_nginx() {
-	printf "${BLUE}Starting NGINX...${NC}\n"
-	docker run --rm --name "${IMAGE_NAME}" -d -p 8000:80 ${FULL_IMAGE_NAME}
+	printf "${BLUE}Starting NGINX container (${IMAGE_NAME})...${NC}\n"
+	docker run --rm --name "${IMAGE_NAME}" -d -p 8000:80 ${FULL_IMAGE_NAME} >/dev/null
 }
 
 stop_nginx() {
-	docker stop "${IMAGE_NAME}"
+	docker stop "${IMAGE_NAME}" >/dev/null
 }
 
 cp_bin() {
-	if [ "$(docker container inspect -f '{{.State.Running}}' ${IMAGE_NAME})" != "true" ]; then
+	local destDir=bin
+	local stopContainer=0;
+
+	if [ "$(docker container inspect -f '{{.State.Running}}' ${IMAGE_NAME} | true)" != "true" ]; then
 		start_nginx
+		stopContainer=1
 	fi
 
-	printf "${BLUE}Copying binaries...${NC}\n"
-	rm -rf bin
-	mkdir bin
+	printf "${BLUE}Copying binaries to: ${destDir}${NC}\n"
+	rm -rf ${destDir}/*
+	mkdir -p ${destDir}
 	docker exec "${IMAGE_NAME}" sh -c "cd /; tar -chf - \
 		usr/lib64/nginx/modules/ngx_http_auth_jwt_module.so \
 		usr/lib/x86_64-linux-gnu/libjansson.so.* \
-		usr/lib/x86_64-linux-gnu/libjwt.*" | tar -xf - -C bin &>/dev/null
+		usr/lib/x86_64-linux-gnu/libjwt.*" | tar -xf - -C ${destDir} &>/dev/null
+	
+	if [ $stopContainer ]; then
+		printf "${BLUE}Stopping NGINX container (${IMAGE_NAME})...${NC}\n"
+		stop_nginx
+	fi
 }
 
 build_test_runner() {