XMerge branch 'production'

uniuuu · uniuuu · commit 03a2dfd15cb5 · 2023-04-29T17:47:20.000+07:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/README.md b/README.md
@@ -57,6 +57,19 @@ $ cd ..
 
 ## Client installation
 
+
+### BETA: Build client via Docker.  
+
+*Run*:
+```bash
+$ DOCKER_BUILDKIT=1 docker build --progress=plain --file client.Dockerfile --output build .
+```
+*Run*:
+```bash
+$ ./build/staging/Zotero_VERSION/zotero)
+```
+
+
 ### Dependencies and source code
 
 For [m|l|w]: m=Mac, w=Windows, l=Linux
diff --git a/bin/init.sh b/bin/init.sh
@@ -2,7 +2,10 @@
 
 set -eux
 
-sudo docker compose exec app-zotprime-dataserver bash -cux 'cd /var/www/zotero/misc && ./init-mysql.sh'
-sudo docker compose exec app-zotprime-dataserver bash -cux 'aws --endpoint-url "http://minio:9000" s3 mb s3://zotero'
-sudo docker compose exec app-zotprime-dataserver bash -cux 'aws --endpoint-url "http://minio:9000" s3 mb s3://zotero-fulltext'
-sudo docker compose exec app-zotprime-dataserver bash -cux 'aws --endpoint-url "http://localstack:4575" sns create-topic --name zotero'
+sudo docker compose exec app-zotprime-dataserver sh -cux 'cd /var/www/zotero/misc && ./init-mysql.sh'
+#sudo docker compose exec app-zotprime-dataserver sh -cux 'cd /var/www/zotero/misc && ./db_update.sh'
+#sudo docker compose exec app-zotprime-dataserver sh -cux 'cd /var/www/zotero/misc/db-updates/2021-10-16 && php ./0_addMasterGroupHasData'
+#sudo docker compose exec app-zotprime-dataserver sh -cux 'cd /var/www/zotero/misc/db-updates/2021-10-16 && php ./1_removeMasterGroupTimestampAndVersion'
+sudo docker compose exec app-zotprime-dataserver sh -cux 'aws --endpoint-url "http://minio:9000" s3 mb s3://zotero'
+sudo docker compose exec app-zotprime-dataserver sh -cux 'aws --endpoint-url "http://minio:9000" s3 mb s3://zotero-fulltext'
+sudo docker compose exec app-zotprime-dataserver sh -cux 'aws --endpoint-url "http://localstack:4575" sns create-topic --name zotero'
diff --git a/client.Dockerfile b/client.Dockerfile
@@ -0,0 +1,31 @@
+
+FROM node:16-alpine as intermediate
+RUN set -eux; \ 
+    apk update && apk upgrade && \
+    apk add --update --no-cache git bash curl python3 zip perl rsync \
+    && rm -rf /var/cache/apk/*
+WORKDIR /usr/src/app
+COPY . .
+RUN git submodule update --init --recursive client/zotero-build
+RUN git submodule update --init --recursive client/zotero-standalone-build
+RUN git submodule update --init --recursive client/zotero-client
+WORKDIR /usr/src/app/client/
+RUN set -eux; \
+    ./config.sh
+WORKDIR /usr/src/app/client/zotero-client
+RUN set -eux; \
+     npx browserslist@latest --update-db
+RUN set -eux; \
+    npm install
+RUN set -eux; \
+    npm run build
+WORKDIR /usr/src/app/client/zotero-standalone-build
+RUN set -eux; \
+    /bin/bash -c './fetch_xulrunner.sh -p l'
+RUN set -eux; \
+    ./fetch_pdftools
+RUN set -eux; \
+    ./scripts/dir_build -p l
+
+FROM scratch AS export-stage
+COPY --from=intermediate /usr/src/app/client/zotero-standalone-build/staging .
diff --git a/client.Dockerfile.dockerignore b/client.Dockerfile.dockerignore
@@ -0,0 +1,26 @@
+clinet/zotero-clinet/.DS_Store
+clinet/zotero-clinet/node_modules
+clinet/zotero-clinet/build
+clinet/zotero-clinet/.signatures.json
+clinet/zotero-clinet/tmp
+clinet/zotero-build/config.sh
+clinet/zotero-build/node_modules
+clinet/zotero-standalone-build/*~
+clinet/zotero-standalone-build/cache
+clinet/zotero-standalone-build/config-custom.sh
+clinet/zotero-standalone-build/dist
+clinet/zotero-standalone-build/staging
+clinet/zotero-standalone-build/xulrunner
+clinet/zotero-standalone-build/pdftools
+.github
+bin
+build
+dataserver
+doc
+docker
+stream-server
+tinymce-clean-server
+Zend
+docker-compose.yml
+*.Dockerfile
+README.md
diff --git a/client/config.sh b/client/config.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+set -eux
+
+sed -i "s#'http://zotero.org/'#'http://localhost:8080/'#g" zotero-client/resource/config.js 
+sed -i "s#'zotero.org'#'localhost'#g" zotero-client/resource/config.js
 sed -i 's#https://api.zotero.org/#http://localhost:8080/#g' zotero-client/resource/config.js
 sed -i 's#wss://stream.zotero.org/#ws://localhost:8081/#g' zotero-client/resource/config.js
 sed -i 's#https://www.zotero.org/#http://localhost:8080/#g' zotero-client/resource/config.js
diff --git a/client/zotero-build b/client/zotero-build
@@ -1 +1 @@
-Subproject commit f5d249841b839972625fd8359732b1ba0bb8c829
+Subproject commit 5cec38cd40361d939e32eb0b6e0fd18ac7b78a56
diff --git a/client/zotero-client b/client/zotero-client
@@ -1 +1 @@
-Subproject commit fb61ea4ba239f9c748b6345e159b88b7ca57dbf3
+Subproject commit 2f0d41c0cb9ea47cce03ea51bf8ac718dbe44b15
diff --git a/client/zotero-standalone-build b/client/zotero-standalone-build
@@ -1 +1 @@
-Subproject commit 3e5c84346ff59db0cdb28493b440fdeda2d8aaf7
+Subproject commit ea60c6deb021f46f5396ea752e8da772b7350a72
diff --git a/clientbuildtest.Dockerfile b/clientbuildtest.Dockerfile
@@ -0,0 +1,36 @@
+
+FROM node:16-alpine as intermediate
+
+RUN set -eux; \ 
+    apk update && apk upgrade && \
+    apk add --update --no-cache git bash curl python3 zip perl rsync \
+    && rm -rf /var/cache/apk/*
+WORKDIR /usr/src/app
+RUN mkdir client
+RUN cd client
+RUN git init
+RUN git remote add -f origin https://github.com/uniuuu/zotprime
+RUN echo "client/" >> .git/info/sparse-checkout
+RUN git pull origin new_dev
+RUN git submodule update --init --recursive
+WORKDIR /usr/src/app/client/
+RUN set -eux; \
+    ./config.sh
+WORKDIR /usr/src/app/client/zotero-client
+RUN set -eux; \
+    npx browserslist@latest --update-db
+RUN set -eux; \
+    npm install
+RUN set -eux; \
+    npm run build
+WORKDIR /usr/src/app/client/zotero-standalone-build
+RUN set -eux; \
+    ./fetch_xulrunner.sh -p l
+RUN set -eux; \
+    ./fetch_pdftools
+RUN set -eux; \
+    ./scripts/dir_build -p l
+
+
+FROM scratch AS export-stage
+COPY --from=intermediate /usr/src/app/client/zotero-standalone-build/staging/* .
diff --git a/clientbuildtest.Dockerfile.dockerignore b/clientbuildtest.Dockerfile.dockerignore
@@ -0,0 +1,11 @@
+.github
+bin
+build
+dataserver
+doc
+docker
+stream-server
+tinymce-clean-server
+Zend
+docker-compose.yml
+
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -38,7 +38,7 @@ services:
     environment:
       - SERVICES=sns,sqs,apigateway
   db-zotprime-minio:
-    image: minio/minio
+#    image: minio/minio
     build:
       context: .
       dockerfile: minio.Dockerfile
@@ -63,6 +63,7 @@ services:
       - "./docker/dataserver/config/header.inc.php:/var/www/zotero/include/header.inc.php:ro"
       - "./docker/dataserver/config/Storage.inc.php:/var/www/zotero/model/Storage.inc.php:ro"
       - "./docker/dataserver/dbinit/init-mysql.sh:/var/www/zotero/misc/init-mysql.sh:ro"
+#      - "./docker/dataserver/dbinit/db_update.sh:/var/www/zotero/misc/db_update.sh:ro"
       - "./docker/dataserver/dbinit/www.sql:/var/www/zotero/misc/www.sql:ro"
       - "./docker/dataserver/dbinit/shard.sql:/var/www/zotero/misc/shard.sql:ro"
       - "./docker/dataserver/config/create-user.sh:/var/www/zotero/admin/create-user.sh:ro"
diff --git a/docker/dataserver/config/config.inc.php b/docker/dataserver/config/config.inc.php
@@ -10,7 +10,7 @@ class Z_CONFIG {
 	public static $TESTING_SITE = false;
 	public static $DEV_SITE = false;
 	
-	public static $DEBUG_LOG = true;
+	public static $DEBUG_LOG = false;
 	
 	public static $BASE_URI = 'http://localhost:8080/';
 	public static $API_BASE_URI = 'http://localhost:8080/';
diff --git a/docker/dataserver/dbinit/db_update.sh b/docker/dataserver/dbinit/db_update.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -xue
+
+for i in db-updates/*/; do
+    cd /var/www/zotero/misc/$i
+    for j in *; do
+        find . -type f \( ! -name *.sql \) -exec php {} \;
+        find . -type f -name *.sql -exec bash -c 'mysql -h mysql -P 3306 -u root -pzotero zotero_master < {}' \;
+    done    
+done;
+cd ../../
diff --git a/docker/dataserver/entrypoint.sh b/docker/dataserver/entrypoint.sh
@@ -12,13 +12,15 @@ export APACHE_LOG_DIR=/var/log/apache2
 #/etc/init.d/rsyslog start
 
 # Start rinetd
-/etc/init.d/rinetd start
+echo "logfile /dev/stdout" >> /etc/rinetd.conf
+rinetd -f -c /etc/rinetd.conf &
+#/etc/init.d/rinetd start
 
-a2enmod headers 
-a2enmod rewrite
-a2dissite 000-default
-a2ensite zotero
-a2enconf gzip
+#a2enmod headers 
+#a2enmod rewrite
+#a2dissite 000-default
+#a2ensite zotero
+#a2enconf gzip
 
 # NPM
 #cd /var/www/zotero/stream-server 
@@ -57,4 +59,5 @@ cd /var/www/zotero && composer -vv install
 
 # Start Apache2
 #exec apache2 -e debug -DNO_DETACH -k start
-exec apache2 -e debug -DFOREGROUND -k start
+exec httpd -e debug -DFOREGROUND -k start
+#exec httpd -DFOREGROUND -k start
diff --git a/ds.Dockerfile b/ds.Dockerfile
diff --git a/ds.Dockerfile.dockerignore b/ds.Dockerfile.dockerignore
diff --git a/minio.Dockerfile.dockerignore b/minio.Dockerfile.dockerignore
diff --git a/sts.Dockerfile b/sts.Dockerfile
diff --git a/sts.Dockerfile.dockerignore b/sts.Dockerfile.dockerignore
diff --git a/tmcs.Dockerfile.dockerignore b/tmcs.Dockerfile.dockerignore
