Compare commits
No commits in common. "8924f2ef22dd68208dcc145c3f1a7ddfd97812df" and "ff1bf042e77d45d714ee107dfe4b588c757fe6be" have entirely different histories.
8924f2ef22
...
ff1bf042e7
6 changed files with 7 additions and 121 deletions
|
|
@ -2,7 +2,6 @@ services:
|
||||||
kasvc-0: &kasvc
|
kasvc-0: &kasvc
|
||||||
build:
|
build:
|
||||||
context: kasvc
|
context: kasvc
|
||||||
network: host
|
|
||||||
platforms:
|
platforms:
|
||||||
- linux/x86_64
|
- linux/x86_64
|
||||||
platform: linux/x86_64
|
platform: linux/x86_64
|
||||||
|
|
@ -54,11 +53,9 @@ services:
|
||||||
kaproxy:
|
kaproxy:
|
||||||
build:
|
build:
|
||||||
context: kaproxy
|
context: kaproxy
|
||||||
network: host
|
|
||||||
platforms:
|
platforms:
|
||||||
- linux/x86_64
|
- linux/x86_64
|
||||||
platform: linux/x86_64
|
platform: linux/x86_64
|
||||||
privileged: true
|
|
||||||
ports:
|
ports:
|
||||||
- 8079:8080
|
- 8079:8080
|
||||||
networks:
|
networks:
|
||||||
|
|
@ -71,7 +68,6 @@ services:
|
||||||
kaclient:
|
kaclient:
|
||||||
build:
|
build:
|
||||||
context: kaclient
|
context: kaclient
|
||||||
network: host
|
|
||||||
platforms:
|
platforms:
|
||||||
- linux/x86_64
|
- linux/x86_64
|
||||||
platform: linux/x86_64
|
platform: linux/x86_64
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
FROM archlinux:latest
|
FROM archlinux:latest
|
||||||
|
RUN pacman -Syyu --noconfirm
|
||||||
RUN pacman -Sy curl --noconfirm
|
RUN pacman -S curl --noconfirm
|
||||||
|
|
||||||
COPY run.sh /
|
COPY run.sh /
|
||||||
CMD ["/run.sh"]
|
CMD ["/run.sh"]
|
||||||
|
|
|
||||||
|
|
@ -2,97 +2,16 @@ FROM archlinux:latest
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
||||||
RUN pacman -Syyu --noconfirm
|
RUN pacman -Syyu --noconfirm
|
||||||
RUN pacman -S base-devel glibc gcc-libs perf --noconfirm
|
RUN pacman -S base-devel glibc gcc-libs --noconfirm
|
||||||
COPY nginx /nginx
|
COPY nginx /nginx
|
||||||
WORKDIR /nginx
|
WORKDIR /nginx
|
||||||
RUN auto/configure \
|
RUN auto/configure \
|
||||||
--with-debug \
|
--with-debug \
|
||||||
--with-http_ssl_module \
|
--with-http_ssl_module \
|
||||||
--with-cc-opt="-ggdb -fno-omit-frame-pointer"
|
--with-cc-opt=-pg
|
||||||
RUN make
|
RUN make
|
||||||
RUN make install
|
RUN make install
|
||||||
COPY nginx.conf /
|
COPY nginx.conf /
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
RUN openssl req -x509 \
|
|
||||||
-newkey rsa:4096 \
|
|
||||||
-keyout key0.pem \
|
|
||||||
-out cert0.pem \
|
|
||||||
-sha256 -nodes \
|
|
||||||
-days 3650 \
|
|
||||||
-subj "/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=www.example.com"
|
|
||||||
|
|
||||||
RUN openssl req -x509 \
|
|
||||||
-newkey rsa:4096 \
|
|
||||||
-keyout key1.pem \
|
|
||||||
-out cert1.pem \
|
|
||||||
-sha256 -nodes \
|
|
||||||
-days 3650 \
|
|
||||||
-subj "/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=www.example.com"
|
|
||||||
|
|
||||||
RUN openssl req -x509 \
|
|
||||||
-newkey rsa:4096 \
|
|
||||||
-keyout key2.pem \
|
|
||||||
-out cert2.pem \
|
|
||||||
-sha256 -nodes \
|
|
||||||
-days 3650 \
|
|
||||||
-subj "/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=www.example.com"
|
|
||||||
|
|
||||||
RUN openssl req -x509 \
|
|
||||||
-newkey rsa:4096 \
|
|
||||||
-keyout key3.pem \
|
|
||||||
-out cert3.pem \
|
|
||||||
-sha256 -nodes \
|
|
||||||
-days 3650 \
|
|
||||||
-subj "/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=www.example.com"
|
|
||||||
|
|
||||||
RUN openssl req -x509 \
|
|
||||||
-newkey rsa:4096 \
|
|
||||||
-keyout key4.pem \
|
|
||||||
-out cert4.pem \
|
|
||||||
-sha256 -nodes \
|
|
||||||
-days 3650 \
|
|
||||||
-subj "/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=www.example.com"
|
|
||||||
|
|
||||||
RUN openssl req -x509 \
|
|
||||||
-newkey rsa:4096 \
|
|
||||||
-keyout key5.pem \
|
|
||||||
-out cert5.pem \
|
|
||||||
-sha256 -nodes \
|
|
||||||
-days 3650 \
|
|
||||||
-subj "/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=www.example.com"
|
|
||||||
|
|
||||||
RUN openssl req -x509 \
|
|
||||||
-newkey rsa:4096 \
|
|
||||||
-keyout key6.pem \
|
|
||||||
-out cert6.pem \
|
|
||||||
-sha256 -nodes \
|
|
||||||
-days 3650 \
|
|
||||||
-subj "/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=www.example.com"
|
|
||||||
|
|
||||||
RUN openssl req -x509 \
|
|
||||||
-newkey rsa:4096 \
|
|
||||||
-keyout key7.pem \
|
|
||||||
-out cert7.pem \
|
|
||||||
-sha256 -nodes \
|
|
||||||
-days 3650 \
|
|
||||||
-subj "/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=www.example.com"
|
|
||||||
|
|
||||||
RUN openssl req -x509 \
|
|
||||||
-newkey rsa:4096 \
|
|
||||||
-keyout key8.pem \
|
|
||||||
-out cert8.pem \
|
|
||||||
-sha256 -nodes \
|
|
||||||
-days 3650 \
|
|
||||||
-subj "/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=www.example.com"
|
|
||||||
|
|
||||||
RUN openssl req -x509 \
|
|
||||||
-newkey rsa:4096 \
|
|
||||||
-keyout key9.pem \
|
|
||||||
-out cert9.pem \
|
|
||||||
-sha256 -nodes \
|
|
||||||
-days 3650 \
|
|
||||||
-subj "/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=www.example.com"
|
|
||||||
|
|
||||||
COPY dhparam.pem /
|
COPY dhparam.pem /
|
||||||
COPY www.example.com.crt /
|
COPY www.example.com.crt /
|
||||||
|
|
|
||||||
|
|
@ -15,65 +15,44 @@ http {
|
||||||
ssl_certificate /www.example.com.crt;
|
ssl_certificate /www.example.com.crt;
|
||||||
ssl_certificate_key /www.example.com.key;
|
ssl_certificate_key /www.example.com.key;
|
||||||
access_log /tmp/access.log;
|
access_log /tmp/access.log;
|
||||||
proxy_socket_keepalive on;
|
|
||||||
|
|
||||||
location /0 {
|
location /0 {
|
||||||
proxy_ssl_certificate /cert0.pem;
|
|
||||||
proxy_ssl_certificate_key /key0.pem;
|
|
||||||
proxy_pass http://kasvc-0:8080;
|
proxy_pass http://kasvc-0:8080;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /1 {
|
location /1 {
|
||||||
proxy_ssl_certificate /cert1.pem;
|
|
||||||
proxy_ssl_certificate_key /key1.pem;
|
|
||||||
proxy_pass http://kasvc-1:8080;
|
proxy_pass http://kasvc-1:8080;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /2 {
|
location /2 {
|
||||||
proxy_ssl_certificate /cert2.pem;
|
|
||||||
proxy_ssl_certificate_key /key2.pem;
|
|
||||||
proxy_pass http://kasvc-2:8080;
|
proxy_pass http://kasvc-2:8080;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /3 {
|
location /3 {
|
||||||
proxy_ssl_certificate /cert3.pem;
|
|
||||||
proxy_ssl_certificate_key /key3.pem;
|
|
||||||
proxy_pass http://kasvc-3:8080;
|
proxy_pass http://kasvc-3:8080;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /4 {
|
location /4 {
|
||||||
proxy_ssl_certificate /cert4.pem;
|
|
||||||
proxy_ssl_certificate_key /key4.pem;
|
|
||||||
proxy_pass http://kasvc-4:8080;
|
proxy_pass http://kasvc-4:8080;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /5 {
|
location /5 {
|
||||||
proxy_ssl_certificate /cert5.pem;
|
|
||||||
proxy_ssl_certificate_key /key5.pem;
|
|
||||||
proxy_pass http://kasvc-5:8080;
|
proxy_pass http://kasvc-5:8080;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /6 {
|
location /6 {
|
||||||
proxy_ssl_certificate /cert6.pem;
|
|
||||||
proxy_ssl_certificate_key /key6.pem;
|
|
||||||
proxy_pass http://kasvc-6:8080;
|
proxy_pass http://kasvc-6:8080;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /7 {
|
location /7 {
|
||||||
proxy_ssl_certificate /cert7.pem;
|
|
||||||
proxy_ssl_certificate_key /key7.pem;
|
|
||||||
proxy_pass http://kasvc-7:8080;
|
proxy_pass http://kasvc-7:8080;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /8 {
|
location /8 {
|
||||||
proxy_ssl_certificate /cert8.pem;
|
|
||||||
proxy_ssl_certificate_key /key8.pem;
|
|
||||||
proxy_pass http://kasvc-8:8080;
|
proxy_pass http://kasvc-8:8080;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /9 {
|
location /9 {
|
||||||
proxy_ssl_certificate /cert9.pem;
|
|
||||||
proxy_ssl_certificate_key /key9.pem;
|
|
||||||
proxy_pass http://kasvc-9:8080;
|
proxy_pass http://kasvc-9:8080;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
function p_invoke() {
|
|
||||||
perf record -F1000 --call-graph dwarf -o /perf.data \
|
|
||||||
-- /nginx/objs/nginx \
|
|
||||||
-p /tmp \
|
|
||||||
-e /tmp/error.log \
|
|
||||||
-c /nginx.conf \
|
|
||||||
-g "daemon off;"
|
|
||||||
}
|
|
||||||
|
|
||||||
function invoke() {
|
function invoke() {
|
||||||
/nginx/objs/nginx \
|
/nginx/objs/nginx \
|
||||||
-p /tmp \
|
-p /tmp \
|
||||||
|
|
@ -32,7 +23,7 @@ function sigcont_handler() {
|
||||||
trap 'sigint_handler' INT
|
trap 'sigint_handler' INT
|
||||||
trap 'sigcont_handler' CONT
|
trap 'sigcont_handler' CONT
|
||||||
|
|
||||||
p_invoke &
|
invoke &
|
||||||
wait
|
wait
|
||||||
echo "NGINX down. waiting until signalled..."
|
echo "NGINX down. waiting until signalled..."
|
||||||
sleep infinity
|
sleep infinity
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
FROM archlinux:latest
|
FROM archlinux:latest
|
||||||
RUN pacman -Sy glibc gcc-libs --noconfirm
|
RUN pacman -Syyu --noconfirm
|
||||||
|
RUN pacman -S glibc gcc-libs --noconfirm
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
COPY keepalive-svc /
|
COPY keepalive-svc /
|
||||||
CMD ["/keepalive-svc"]
|
CMD ["/keepalive-svc"]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue