Merge pull request #9 from fooinha/docker/mount

nginx-ssl-ja3: docker with volume

Author: fooinha

.travis.yml

@@ -36,9 +36,9 @@ script:
   - make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
   - sudo make install > build.log 2>&1 || (cat build.log && exit 1)
   - cd ..
-  - cp -v docker/debian-nginx-ssl-ja3/nginx.1.15.9.ssl.extensions.patch nginx/.
+  - cp -v patches/latest.patch nginx/.
   - cd nginx
-  - patch -p1 < nginx.1.15.9.ssl.extensions.patch
+  - patch -p1 < latest.patch
   - auto/configure --with-debug --with-stream --with-ld-opt="-Wl,-E -L /usr/local/lib" --prefix=$NGINX_PREFIX  --with-http_ssl_module --with-stream_ssl_module --add-module=.. > build.log 2>&1 || (cat build.log && exit 1)
   - make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
   - sudo make install > build.log 2>&1 || (cat build.log && exit 1)

docker/debian-nginx-ssl-ja3/Dockerfile

@@ -4,8 +4,6 @@ LABEL maintainer "[email protected]"
 
 # Build arguments
 ARG DEBIAN_REPO_HOST=httpredir.debian.org
-ARG GIT_LOCATION=https://github.com/fooinha/nginx-ssl-ja3.git
-ARG GIT_BRANCH=master
 
 # Mirror to my location
 RUN echo "deb http://${DEBIAN_REPO_HOST}/debian sid main" > /etc/apt/sources.list
@@ -56,11 +54,7 @@ RUN mkdir -p /build
 
 WORKDIR /build
 
-# Fetches and clones from git location
-RUN git clone ${GIT_LOCATION}
-RUN cd nginx-ssl-ja3 && git checkout ${GIT_BRANCH}
-
-WORKDIR /build
+VOLUME ["/build/nginx-ssl-ja3"]
 
 # Get test framework
 RUN git clone https://github.com/nginx/nginx-tests
@@ -80,25 +74,18 @@ RUN hg clone http://hg.nginx.org/nginx
 
 # Patch nginx for fetching ssl client extensions
 WORKDIR /build/nginx
-COPY nginx.1.15.9.ssl.extensions.patch /build/nginx
-RUN patch -p1 < nginx.1.15.9.ssl.extensions.patch
-
-# Configure, make and install
-RUN ./auto/configure --add-module=/build/nginx-ssl-ja3 --with-http_ssl_module --with-stream_ssl_module --with-stream --with-debug --with-ld-opt="-L/usr/local/lib -Wl,-E"
-RUN make install
+COPY patches/latest.patch /build/nginx
+RUN patch -p1 < latest.patch
 
 # Install files
 RUN mkdir -p /usr/local/nginx/conf/
-COPY nginx.conf /usr/local/nginx/conf/nginx.conf
+COPY docker/debian-nginx-ssl-ja3/nginx.conf /usr/local/nginx/conf/nginx.conf
 
 # Install self-signed certificate
 RUN LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib /usr/local/bin/openssl req -new -x509 -days 365 -nodes -out /usr/local/nginx/conf/cert.pem -keyout /usr/local/nginx/conf/rsa.key -subj "/C=PT/ST=Lisbon/L=Lisbon/O=Development/CN=foo.local"
 
-# exuberant ctags
-RUN cd /build/nginx-ssl-ja3 && ctags -R src/ ../nginx/src/
-
 # vim config
-COPY vimrc /etc/vim/vimrc
+COPY docker/debian-nginx-ssl-ja3/vimrc /etc/vim/vimrc
 
 RUN echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib' | tee -a /root/.bashrc
 RUN echo 'export PATH=$PATH:/usr/local/bin:/usr/local/nginx/sbin' | tee -a /root/.bashrc
@@ -107,6 +94,8 @@ RUN echo 'export ASAN_OPTIONS=symbolize=1' | tee -a /root/.bashrc
 RUN echo 'export export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer' | tee -a /root/.bashrc
 RUN echo '' | tee -a /root/.bashrc
 
+WORKDIR /build
+COPY docker/debian-nginx-ssl-ja3/compile.sh /build/compile.sh
 RUN echo 'TO COMPILE RUN:\n    cd nginx\n    ASAN_OPTIONS=symbolize=1 ./auto/configure --add-module=/build/nginx-ssl-ja3 --with-http_ssl_module --with-stream_ssl_module --with-debug --with-stream --with-cc-opt="-fsanitize=address -O -fno-omit-frame-pointer" --with-ld-opt="-L/usr/local/lib -Wl,-E -lasan"\n    make install' | tee -a /build/COMPILE.ASAN.README
 RUN echo 'TO TEST RUN:\n    nginx &\n    openssl s_client -connect 127.0.0.1:12345 -cipher "AES128-SHA" -curves secp521r1' | tee -a /build/TEST.README
 

docker/debian-nginx-ssl-ja3/compile.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cd nginx
+ASAN_OPTIONS=symbolize=1 ./auto/configure --add-module=/build/nginx-ssl-ja3 --with-http_ssl_module --with-stream_ssl_module --with-debug --with-stream --with-cc-opt="-fsanitize=address -O -fno-omit-frame-pointer" --with-ld-opt="-L/usr/local/lib -Wl,-E -lasan"
+make install
+cd -

docker/docker-compose.yml

@@ -1,26 +1,15 @@
 version: '3'
 
-
 services:
 
-#    nginx:
-#        build: ./alpine-nginx-ssl-ja3
-#        hostname: nginx
-#        container_name: nginx-ssl-ja3
-#        ports:
-#          - "80:80"
-#        expose:
-#          - 80
-#        network_mode: bridge
-#        tty: true
-#        privileged: true
-#        cap_add:
-#          - ALL
-
     nginx-dev:
-        build: ./debian-nginx-ssl-ja3
+        build:
+            context: ../
+            dockerfile: docker/debian-nginx-ssl-ja3/Dockerfile
         hostname: nginx-dev
         container_name: nginx-ssl-ja3
+        volumes:
+            - ../:/build/nginx-ssl-ja3
         ports:
           - "443:443"
         expose:

patches/latest.patch

@@ -1 +1 @@
-../docker/debian-nginx-ssl-ja3/nginx.1.15.9.ssl.extensions.patch
+nginx.1.15.9.ssl.extensions.patch