Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZotPrime V2 beta #29

Open
wants to merge 78 commits into
base: master
Choose a base branch
from
Open

ZotPrime V2 beta #29

wants to merge 78 commits into from

Conversation

uniuuu
Copy link

@uniuuu uniuuu commented Apr 24, 2023

ZotPrime V2 Release Candidate

  • Dataserver has been updated to the latest version/commit.
  • Client has been updated to 6.0.27 (CI checks if any new update above 6.0.27).
  • Fixed dataserver issues.
  • Fixed and updated dependencies.
  • Reorganized folder structure.
  • Split tinymceclean-server and stream-server into separate containers.
  • Converted dataserver image to alpine.
  • Added automatic client building via docker.
  • Updated minio to the latest. Latest version has separate Web UI port. Minor change. Minio Web UI is served at port 9001.
  • Added possibility to interactively enter a server ip/hostname for a setup with server on VM.
  • Dataserver is being copied during image building and won't mount as a volume in docker compose.
  • Added DEV and PROD docker compose types.
  • Added simple one command way to build client .
  • Removed rinetd.
  • Added Kubernetes installation in GKE and Microk8s

@uniuuu uniuuu changed the title Pre-Alpha Alpha Apr 28, 2023
@uniuuu uniuuu changed the title Alpha ZotPrime V2 beta Apr 29, 2023
uniuuu and others added 25 commits May 8, 2023 13:31
- Moved stream server to a separate container
- Verified that built of the client v6 succeeded. With Node js v16.
- Fixed issue Minio won't start due to version incompatibility. Set to version RELEASE.2018-10-25T01-27-03Z used at the time of zotprime first release
- Fixed issue Elastica won't start due to version incompatibility. Set to version RELEASE.2018-10-25T01-27-03Z used at the time of zotprime first release
- Fixed issue Class 'Redis' not found
- Fixed issue uWebSockets.js (uws) NPM couldn't build
- Fixed environmental variables in app-zotero container
- Disabled overloading cpu rsyslogd
- Moved apache setup to entrypoint.sh
- Fixed docker/bin/run.sh docker/bin/create-user.sh scripts in regards to latest docker compose plugin version

git submodule status
 f5d249841b839972625fd8359732b1ba0bb8c829 client/zotero-build (heads/uptodatesubmodules)
 fb61ea4ba239f9c748b6345e159b88b7ca57dbf3 client/zotero-client (6.0.23-43-gfb61ea4ba)
 3e5c84346ff59db0cdb28493b440fdeda2d8aaf7 client/zotero-standalone-build (6.0.21-5-g3e5c843)
 66e2ad6264455895e0506b84df03e7189f5f7a71 include/Elastica (v0.16.0.0-2202-g66e2ad62)
 d2063ca003df3294164ae786ad96e29c4c36a832 stream-server (heads/docker)
 f4d74787d182cf0829f98a259e512cae6ca61a58 tinymce-clean-server (heads/docker)
uniuuu and others added 18 commits May 8, 2023 13:33
MariaDB:
You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS new\n\t\t\t\tON DUPLICATE KEY UPDATE storageFileID=new.storageFileID, mtime=new...' at line 1\n\nShard: 1\n\nQuery:\nINSERT INTO storageFileItems (storageFileID, itemID, mtime, size) VALUES (?,?,?,?) AS new\n\t\t\t\tON DUPLICATE KEY UPDATE storageFileID=new.storageFileID, mtime=new.mtime, size=new.size\n\nParams:\nArray\n(\n)\n\n\n\n\nShard: 1\n\nQuery:\nINSERT INTO storageFileItems (storageFileID, itemID, mtime, size) VALUES (?,?,?,?) AS new\n\t\t\t\tON DUPLICATE KEY UPDATE storageFileID=new.storageFileID, mtime=new.mtime, size=new.size\n\nParams:\nArray\n(\n    [0] => 1\n    [1] => 2\n    [2] => 1683662528000\n    [3] => 43586\n)\n\n\n in /var/www/zotero/include/DB.inc.php:1308 (Version: 6.0.27.SOURCE.2f0d41c0c POST /users/1/items/QBHSDG4M/file) (92edc9fce9)
MySQL:
You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS new\n\t\t\t\tON DUPLICATE KEY UPDATE storageFileID=new.storageFileID, mtime=new.mt' at line 1\n\nShard: 1\n\nQuery:\nINSERT INTO storageFileItems (storageFileID, itemID, mtime, size) VALUES (?,?,?,?) AS new\n\t\t\t\tON DUPLICATE KEY UPDATE storageFileID=new.storageFileID, mtime=new.mtime, size=new.size\n\nParams:\nArray\n(\n)\n\n\n\n\nShard: 1\n\nQuery:\nINSERT INTO storageFileItems (storageFileID, itemID, mtime, size) VALUES (?,?,?,?) AS new\n\t\t\t\tON DUPLICATE KEY UPDATE storageFileID=new.storageFileID, mtime=new.mtime, size=new.size\n\nParams:\nArray\n(\n    [0] => 4\n    [1] => 2\n    [2] => 1683730624000\n    [3] => 43586\n)\n\n\n in /var/www/zotero/include/DB.inc.php:1308 (Version: 6.0.27.SOURCE.2f0d41c0c POST /users/1/items/GKSLEQLL/file) (18e95044e3)
Reverts zotero/dataserver commit 82540c48a99218aa7b5c9565957accece98e04ee
the minio server to cache data on disk, bypassing the 16MB limit
of in-memory caching.
…ror: Data size larger than expected | The body of your POST request is not well-formed multipart/form-data. Issue #6
uniuuu added 11 commits May 11, 2023 02:05
    feat: copy dataserver during image buid and do not mount as a volume
    Reference minio/minio#5469   fix storage bugs   (cherry picked from commit 404ded2)
    patch: k8s objects for tinymceclean, streamserver, redis, localstack, phpmyadmin, elasticsearch, memcached, mariadb, minio
    fix: fix docker compose CI
    fix: fix .gitignore
    feat: Added 1. dev, prod docker compose. 2. docker compose build CI workflow. 3. pre-built images configuration
    patch: updated GKE, microk8s charts
    patch: Added Credits to README
    fix: updated client build to switch between linux/windows and to define api and stream server url's.
    patch: k8s updated GKE terraform, helm-chart
    fix: updated client build to switch between linux/windows and to define api and stream server url's.
    patch: Updated README.md
    patch: Added SSL Certificate Manager. Updated Charts
    patch: Updated Helm Charts
    patch: Restructured secrets. Created Helm Charts
    patch: Added init.sh as postsart script into dataserver pod
    patch: removed CPU limits. Increased data storage. Updated terraform
    patch: client build update
    patch: Pulled down update to client submodules
    patch: Connect from dataserver to mini via internal ip. Structure persistent volume names
    patch: dataserver
    patch: k8s updated liveness probes to fix GKE Ingress
    feat: For localhost server/client access minio via 10.5.5.1:9000. Removed rinetd. Update Zend/Service/Amazon/S3.php
    patch: .vscode to ignore
    feat: move dataserver ip/host config to .env. move stream server config into build
    fix: updated config.inc.php
    patch: configmap streamserver
    patch: Split manifests for microk8s and GKE
    patch: Ingress for GKE
    patch: dataserver config split between microk8s and cloud k8s
    patch: client for k8s
    patch: fix minio manifest volume issue
    patch: fix db manifest volume issue
    patch: ignore kubeconfig
    patch: updated images from dockerhub. Updated terraform
    patch: refactor folders
    patch: k8s refactor yaml names
    fix: refactor miniomc entrypoint and env
    patch: k8s update folder structure. Added miniomc. update objects
    patch: Added priorityclasses
    fix: restart rinetd in case of exit
    patch: k8s update streamserver
    patch: k8s client setup
    patch: k8s objects added ingress, lb
    patch: k8s objects for dataserver
    fix: fix env variables for kubernetes. Remove duplicate env variables from entrypoint.sh
    patch: k8s objects for for elasticsearch updated
    fix: Added prod, dev docker-compose.yml versions, added elasticsearch RAM limit
    feat: copy dataserver during image buid and do not mount as a volume
    patch: k8s objects for tinymceclean
    patch: k8s objects for streamserver; for redis updated
    patch: k8s objects for localstack; for phpmyadmin updated; for db updated
    patch: k8s objects for elasticsearch
    patch: k8s objects for phpmyadmin, memcached; for db updated
    patch: k8s objects for redis
    patch: k8s objects for mariadb; for minio pod update
    feat: Added 1. dev, prod docker compose. 2. docker compose build CI workflow. 3. pre-built images configuration
    patch: k8s objects for minio pod

commit 8cf14aa
Author: piernov <[email protected]>
Date:   Wed Nov 23 16:04:05 2022 +0100

    Reference minio/minio#5469
    fix storage bugs

    (cherry picked from commit 404ded2)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants