tidy

misc/docker/Dockerfile

@@ -21,6 +21,8 @@ COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /usr/share/zoneinfo/Asia/Shanghai /usr/share/zoneinfo/Asia/
 COPY --from=builder /project/server/dist/prod/orca-server-next /orca-server
 
+COPY ./misc/docker/http-ca.crt /etc/ssl/certs/elastic-http-ca.crt
+
 RUN apk add --no-cache gzip brotli
 
 ENV TZ="Asia/Shanghai"

misc/docker/Makefile

@@ -1,5 +1,7 @@
 SHELL:=/bin/bash
 
+TARGET_HOST:=lamia
+
 include ../../server/build/env.sh
 
 build: git
@@ -7,10 +9,10 @@ build: git
 
 run: build
 	sudo docker run \
-		--env "OPENAI_API_KEY=$(OPENAI_API_KEY)" \
-		--env "ORCA_ES_ADDR=$(ORCA_ES_ADDR)" \
-		--env "ORCA_ES_USER=$(ORCA_ES_USER)" \
-		--env "ORCA_ES_PASS=$(ORCA_ES_PASS)" \
+		--env OPENAI_API_KEY=$(OPENAI_API_KEY) \
+		--env ORCA_ES_ADDR=$(ORCA_ES_ADDR) \
+		--env ORCA_ES_USER=$(ORCA_ES_USER) \
+		--env ORCA_ES_PASS=$(ORCA_ES_PASS) \
 		--mount type=bind,source=/www/orca/static,target=/tmp \
 		--mount type=bind,source=/www/orca/server/dist/prod/log,target=/log \
 		-p 127.0.0.1:21035:80 \
@@ -18,11 +20,11 @@ run: build
 
 install: build
 	sudo docker save orca > docker-orca.tar
-	scp docker-orca.tar lamia:/tmp
-	scp install.sh lamia:/tmp
-	scp ../../server/build/env.sh lamia:/tmp
-	ssh lamia "chmod +x /tmp/install.sh && /tmp/install.sh && rm /tmp/install.sh"
-	ssh lamia "rm /tmp/env.sh"
+	scp docker-orca.tar $(TARGET_HOST):/tmp
+	scp install.sh $(TARGET_HOST):/tmp
+	scp ../../server/build/env.sh $(TARGET_HOST):/tmp
+	ssh $(TARGET_HOST) "chmod +x /tmp/install.sh && /tmp/install.sh && rm /tmp/install.sh"
+	ssh $(TARGET_HOST) "rm /tmp/env.sh"
 
 nginx:
 	scp ../nginx/prod.conf lamia:/etc/nginx/vhost.d/600-orca

misc/docker/http-ca.crt

@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIVANjLQxh4SaztUvY7iqHNhQW2rmLUMA0GCSqGSIb3DQEB
+CwUAMDwxOjA4BgNVBAMTMUVsYXN0aWNzZWFyY2ggc2VjdXJpdHkgYXV0by1jb25m
+aWd1cmF0aW9uIEhUVFAgQ0EwHhcNMjMwNjA5MTA1MzE1WhcNMjYwNjA4MTA1MzE1
+WjA8MTowOAYDVQQDEzFFbGFzdGljc2VhcmNoIHNlY3VyaXR5IGF1dG8tY29uZmln
+dXJhdGlvbiBIVFRQIENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
+vGR8lQlWZzgfmU44Y4BlFHroMrz0hwHolJE0w16zG2A1DJ8Ze/SemgORQm1f4Pju
+V+8GISK2uCqvTprW9BxJmGV4UN6eV7boDxezPK7kqkdIF6LaMxPIq55IRs/YKbub
+JDsjfIOFFWglhfX3DarXcPYvucaCLqY9b0IqhbZt2eBeDapqJZdA27Cv1WH3ev4r
+Dfa4fPiq17YsH+H+piBJVZnVb4SzpiPXkz55U4MmqIwhi2DB2/spZdJ2JNxhuVSH
+ABYmqorgTCILpygyM00DgcXqsT5BYti1+zh3wAfPm8rwWy7n+Qn5xkjiLfv59mmb
+PdTpfA6KRZimTLSzzkC71xe/utBTQdGXFfGnjYaGRLD9aj9YbsemPDt7mcqLIX2T
+5iXPlX7gSF8tjbgTgk0B10rx874hsO1hSw+5vRufxyKlHiwgRqhqF0+dVxytk04N
+Q8c9RBrYbdt+7lRXpG0E4t9C521sUVBgD5MDiivgMQAirD7M3xRAHHJpxar+kq0d
+M3GRt4eIoh2bi/MOW0uslG+/7nSUumg/lb+bTM/K/5ndD9vd5KfgvlNaiw4/p4DS
+vSMQJtcu1v/rqH5OwLrTfFJ1W7stlC+4mhvOgPUlMlU4jaiRPOBT9wgxAdTAgGiJ
+phZYQh2p2Ja+294abxn97G2l29KXQCItJbK890u352kCAwEAAaNTMFEwHQYDVR0O
+BBYEFKOVOPxgrhcUnzRtC793ApeiVIytMB8GA1UdIwQYMBaAFKOVOPxgrhcUnzRt
+C793ApeiVIytMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAKev
+mgR2xZZpGR6ccAw+TM9WZ10sMiefhoLuYGFvak/UxM4ZiNylCzWxUPIjdmzN251s
+gPDQZswm4+64Oh+lw6IMZ5iL3GijTbAjFIkNbXcHJbm/Jzfl2o9FK84m8uhyqGHC
+x99YoZJztUzldLdToHF7RHSudmc81z+v66pEK93GMru+8EvQxKy2E0GI6ACsEKTR
+7dX5mN9F5RgMoSgOeGw2gVBYWsL5aYnex7rCs4TgWiQT45fN2kLr+VH7EfTqsB1M
+5MeRaW2iMxPaxmgEXXxzriQr1VR7lHhkWlscHyObyMB1G23AdhK0dbrNfdYeOC8c
+Iddml2ktpo/7wCrb6y0Zyn0pLwzeWBmfvfiavtLnfctmfKFD4v1MlbU/n3PIF3CJ
+jpQBVsnNNFMkngW0siCGg3XlJtxbas0/8o3lqODkvzVH2NLL7vGOvCsCY9MT6ELB
+vM5TQ2n6wQzNtE80WmGBseflE7w0yYYrs0dHryEpuOdUbFylkW+40dcEHmaZDyf3
+3+tw3YSKDqavPJN/4fuqAJPQaDukeoUOY37YC8NcUdKPTPFxpejc0XiQNfpymMUG
+8hFCgUZcE4i931kJBTdCfRXF9914z72+/HMBwpgWdYRuoGRiM6/69cmYB8a6HDEd
+pHrNptkJGWUUVPk2RlOHx4wccvuEqpUlQ/IOFV2N
+-----END CERTIFICATE-----

misc/docker/install.sh

@@ -22,6 +22,9 @@ sudo cat /tmp/docker-orca.tar | sudo docker load
 
 sudo docker run -d --name orca \
 	--env "OPENAI_API_KEY=${OPENAI_API_KEY}" \
+	--env "ORCA_ES_ADDR=${ORCA_ES_ADDR}" \
+	--env "ORCA_ES_USER=${ORCA_ES_USER}" \
+	--env "ORCA_ES_PASS=${ORCA_ES_PASS}" \
 	--mount type=bind,source=/www/orca/log,target=/log \
 	--mount type=bind,source=/www/orca/static,target=/tmp \
 	-p 127.0.0.1:21035:80 \