Skip to content

Commit e336a6a

Browse files
YlarodYlarod
committedJan 4, 2025
use one container
1 parent 6cbb1ee commit e336a6a

17 files changed

+576
-1021
lines changed
 

‎conf.d/default.conf

+5-144
Original file line numberDiff line numberDiff line change
@@ -4,118 +4,13 @@ server {
44
root /usr/local/openresty/nginx/html;
55
index index.html;
66

7-
location /android-5.0.2_r3/ {
8-
proxy_pass http://172.16.22.121:8080/android-5.0.2_r3/;
9-
10-
proxy_set_header Host $host;
11-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
12-
proxy_set_header X-Forwarded-Proto $scheme;
13-
14-
sub_filter '</body>' '<script src="/js/branch.js"></script></body>';
15-
sub_filter_once off;
16-
}
17-
18-
location /android-5.1.0_r1/ {
19-
proxy_pass http://172.16.22.122:8080/android-5.1.0_r1/;
20-
21-
proxy_set_header Host $host;
22-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
23-
proxy_set_header X-Forwarded-Proto $scheme;
24-
25-
sub_filter '</body>' '<script src="/js/branch.js"></script></body>';
26-
sub_filter_once off;
27-
}
28-
29-
location /android-6.0.0_r1/ {
30-
proxy_pass http://172.16.22.123:8080/android-6.0.0_r1/;
31-
32-
proxy_set_header Host $host;
33-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
34-
proxy_set_header X-Forwarded-Proto $scheme;
35-
36-
sub_filter '</body>' '<script src="/js/branch.js"></script></body>';
37-
sub_filter_once off;
38-
}
39-
40-
location /android-7.0.0_r1/ {
41-
proxy_pass http://172.16.22.124:8080/android-7.0.0_r1/;
42-
43-
proxy_set_header Host $host;
44-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
45-
proxy_set_header X-Forwarded-Proto $scheme;
46-
47-
sub_filter '</body>' '<script src="/js/branch.js"></script></body>';
48-
sub_filter_once off;
49-
}
50-
51-
location /android-7.1.0_r4/ {
52-
proxy_pass http://172.16.22.125:8080/android-7.1.0_r4/;
53-
54-
proxy_set_header Host $host;
55-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
56-
proxy_set_header X-Forwarded-Proto $scheme;
57-
58-
sub_filter '</body>' '<script src="/js/branch.js"></script></body>';
59-
sub_filter_once off;
60-
}
61-
62-
location /android-8.0.0_r4/ {
63-
proxy_pass http://172.16.22.126:8080/android-8.0.0_r4/;
64-
65-
proxy_set_header Host $host;
66-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
67-
proxy_set_header X-Forwarded-Proto $scheme;
68-
69-
sub_filter '</body>' '<script src="/js/branch.js"></script></body>';
70-
sub_filter_once off;
71-
}
72-
73-
location /android-8.1.0_r1/ {
74-
proxy_pass http://172.16.22.127:8080/android-8.1.0_r1/;
75-
76-
proxy_set_header Host $host;
77-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
78-
proxy_set_header X-Forwarded-Proto $scheme;
79-
80-
sub_filter '</body>' '<script src="/js/branch.js"></script></body>';
81-
sub_filter_once off;
82-
}
83-
84-
location /android-9.0.0_r3/ {
85-
proxy_pass http://172.16.22.128:8080/android-9.0.0_r3/;
86-
87-
proxy_set_header Host $host;
88-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
89-
proxy_set_header X-Forwarded-Proto $scheme;
90-
91-
sub_filter '</body>' '<script src="/js/branch.js"></script></body>';
92-
sub_filter_once off;
93-
}
94-
95-
location /android-10.0.0_r2/ {
96-
proxy_pass http://172.16.22.129:8080/android-10.0.0_r2/;
97-
98-
proxy_set_header Host $host;
99-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
100-
proxy_set_header X-Forwarded-Proto $scheme;
101-
102-
sub_filter '</body>' '<script src="/js/branch.js"></script></body>';
103-
sub_filter_once off;
104-
}
105-
106-
location /android-11.0.0_r1/ {
107-
proxy_pass http://172.16.22.130:8080/android-11.0.0_r1/;
108-
109-
proxy_set_header Host $host;
110-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
111-
proxy_set_header X-Forwarded-Proto $scheme;
112-
113-
sub_filter '</body>' '<script src="/js/branch.js"></script></body>';
114-
sub_filter_once off;
7+
location /js/ {
8+
root /usr/local/openresty/nginx/html;
9+
try_files $uri =404;
11510
}
11611

117-
location /android-12.0.0_r2/ {
118-
proxy_pass http://172.16.22.131:8080/android-12.0.0_r2/;
12+
location / {
13+
proxy_pass http://172.16.22.100:8080/;
11914

12015
proxy_set_header Host $host;
12116
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -124,38 +19,4 @@ server {
12419
sub_filter '</body>' '<script src="/js/branch.js"></script></body>';
12520
sub_filter_once off;
12621
}
127-
128-
location /android-12.1.0_r1/ {
129-
proxy_pass http://172.16.22.132:8080/android-12.1.0_r1/;
130-
131-
proxy_set_header Host $host;
132-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
133-
proxy_set_header X-Forwarded-Proto $scheme;
134-
135-
sub_filter '</body>' '<script src="/js/branch.js"></script></body>';
136-
sub_filter_once off;
137-
}
138-
139-
location /android-13.0.0_r3/ {
140-
proxy_pass http://172.16.22.133:8080/android-13.0.0_r3/;
141-
142-
proxy_set_header Host $host;
143-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
144-
proxy_set_header X-Forwarded-Proto $scheme;
145-
146-
sub_filter '</body>' '<script src="/js/branch.js"></script></body>';
147-
sub_filter_once off;
148-
}
149-
150-
location /android-14.0.0_r2/ {
151-
proxy_pass http://172.16.22.134:8080/android-14.0.0_r2/;
152-
153-
proxy_set_header Host $host;
154-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
155-
proxy_set_header X-Forwarded-Proto $scheme;
156-
157-
sub_filter '</body>' '<script src="/js/branch.js"></script></body>';
158-
sub_filter_once off;
159-
}
160-
16122
}

‎docker-compose.yml

+8-516
Large diffs are not rendered by default.

‎docker/Dockerfile

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
FROM opengrok/docker:1.13.24
2+
3+
# environment values
4+
ENV SRC_ROOT /opengrok/src
5+
ENV DATA_ROOT /opengrok/data
6+
ENV URL_ROOT /
7+
ENV CATALINA_HOME /usr/local/tomcat
8+
ENV CATALINA_BASE /usr/local/tomcat
9+
ENV CATALINA_TMPDIR /usr/local/tomcat/temp
10+
ENV PATH $CATALINA_HOME/bin:$PATH
11+
ENV CLASSPATH /usr/local/tomcat/bin/bootstrap.jar:/usr/local/tomcat/bin/tomcat-juli.jar
12+
ENV JAVA_OPTS="--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
13+
--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
14+
--add-opens=jdk.compiler/com.sun.tools.javac=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED \
15+
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED \
16+
--add-opens=java.base/java.util=ALL-UNNAMED"
17+
18+
# add our scripts and configuration
19+
RUN rm -rf /scripts
20+
COPY scripts /scripts
21+
RUN chmod -R +x /scripts
22+
23+
# run
24+
WORKDIR $CATALINA_HOME
25+
EXPOSE 8080
26+
CMD ["/scripts/start.py"]

‎docker/scripts/ROOT.war

8.45 KB
Binary file not shown.

‎docker/scripts/deploy.sh

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/usr/bin/env bash
2+
3+
export JAVA_HOME=/usr/lib/jvm/default
4+
log_file="/var/log/aosp-indexer.log"
5+
echo "Versions to deploy:"
6+
for version in `ls /opengrok/src`; do
7+
echo $version
8+
done
9+
sleep 1
10+
echo "Task start:"
11+
for version in `ls /opengrok/src`; do
12+
(
13+
set -x
14+
opengrok-deploy \
15+
-c /opengrok/etc/$version/configuration.xml \
16+
/opengrok/lib/source.war \
17+
/usr/local/tomcat/webapps/$version.war
18+
sleep 20
19+
opengrok-indexer \
20+
-J=-Djava.util.logging.config.file=/opengrok/etc/logging.properties \
21+
-a /opengrok/lib/opengrok.jar -- \
22+
-c /usr/local/bin/ctags \
23+
-s /opengrok/src/$version \
24+
-d /opengrok/data/$version \
25+
-H -P -S -G \
26+
-W /opengrok/etc/${version}/configuration.xml \
27+
-U http://localhost:8080/$version
28+
)
29+
if [ $? -eq 0 ]; then
30+
echo "$(date) $version success."
31+
else
32+
echo "$(date) $version failure."
33+
fi >> "$log_file"
34+
done

‎docker/scripts/docker_config.py

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import os
2+
3+
4+
INDEXER_JAVA_OPTS = os.environ.get("INDEXER_JAVA_OPTS")
5+
CHECK_INDEX = os.environ.get("CHECK_INDEX")
6+
OPENGROK_LOG_LEVEL = os.environ.get("OPENGROK_LOG_LEVEL")
7+
READONLY_CONFIG_FILE = os.environ.get("READONLY_CONFIG_FILE")
8+
TEST_MODE = os.environ.get("TEST_MODE") is not None

‎docker/scripts/migrate.sh

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
3+
# Run in /data/aospapp
4+
5+
sudo cp -rp etc etc_one
6+
7+
for version in `ls src`; do
8+
set -x
9+
sed -i "s|/opengrok/src|/opengrok/src/$version|" etc_one/$version/configuration.xml
10+
sed -i "s|/opengrok/data|/opengrok/data/$version|" etc_one/$version/configuration.xml
11+
done
12+
13+
for version in `ls src`; do
14+
set -x
15+
cp -rp webapps/$version/$version webapps_one/
16+
cp -rp webapps/$version/$version.war webapps_one/
17+
sed -i "s|/opengrok/etc|/opengrok/etc/$version|" webapps_one/$version/WEB-INF/web.xml
18+
done

‎docker/scripts/start.py

+466
Large diffs are not rendered by default.

‎gen.py

-121
This file was deleted.

‎html/css/style.css

-135
This file was deleted.

‎html/favicon.svg

-19
This file was deleted.

‎html/index.html

-69
This file was deleted.

‎html/js/branch.js

+9-8
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,21 @@ $(document).ready(function() {
33
var select = $('<select></select>');
44

55
var branchOptions = [
6-
"android-14.0.0_r1",
7-
"android-13.0.0_r1",
6+
"android-15.0.0_r3",
7+
"android-14.0.0_r2",
8+
"android-13.0.0_r3",
89
"android-12.1.0_r1",
9-
"android-12.0.0_r1",
10+
"android-12.0.0_r2",
1011
"android-11.0.0_r1",
11-
"android-10.0.0_r1",
12-
"android-9.0.0_r1",
12+
"android-10.0.0_r2",
13+
"android-9.0.0_r3",
1314
"android-8.1.0_r1",
14-
"android-8.0.0_r1",
15-
"android-7.1.0_r1",
15+
"android-8.0.0_r4",
16+
"android-7.1.0_r4",
1617
"android-7.0.0_r1",
1718
"android-6.0.0_r1",
1819
"android-5.1.0_r1",
19-
"android-5.0.0_r1"
20+
"android-5.0.2_r3"
2021
];
2122

2223
var currentBranch = window.location.pathname.match(/android-\d+\.\d+\.\d+_r\d+/);

‎init.sh

-6
This file was deleted.

‎start.sh

-1
This file was deleted.

‎stop.sh

-1
This file was deleted.

‎versions.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ android-11.0.0_r1,30
1111
android-12.0.0_r2,31
1212
android-12.1.0_r1,32
1313
android-13.0.0_r3,33
14-
android-14.0.0_r2,34
14+
android-14.0.0_r2,34
15+
android-15.0.0_r3,35

0 commit comments

Comments
 (0)
Please sign in to comment.