Commit Graph

1140 Commits

Author SHA1 Message Date
7a9daa9f4b Set version to 0.13.0 2020-10-19 14:16:16 +02:00
9cdf6ccb85 Update changelog 2020-10-19 14:15:29 +02:00
bcb42920e1 Proper docker files (build from code) - 2.1 (#311)
* new file: base.dockerfile
base docker file for compiling sources

deleted: build-images.sh
replaced by dev-build-images.sh

deleted: build-joex-base.sh
replaced by base / joex dockerfile

changed: consumedir.dockerfile
based on compiled tool-binaries from base image
added health check (basic, check for REST server connection)

new file: dev-build-images.sh
added one build script for all purposes
derives tag from version-file (all snapshot become latest)

new file: dev-push-images.sh
added one push script for all purposes (similar to build)

changed: docker-compose.yml
	* changed regarding entrypoints and commands now being in the images
	* added health checks for 3rd party images (postgres and solr)
	* some minor renaming of the areas

renamed: entrypoint-joex.sh -> joex-entrypoint.sh
	* for better order

renamed: joex-base.dockerfile -> joex.dockerfile
	* also reworked to base on main base image
	* plus renamed for better order

deleted: push-images.sh
	* replaced by dev-push-images.sh

deleted: push-joex-base.sh
	* not necessary anymore

changed: restserver.dockerfile
	* reworked to be base on main base image
	* smaller
	* added health check

* updated docker-compose to new images

* update docker-compose.yml

remove unnecessary network entries

* update docker-compose.yml

added missing volume for postgres

* reverted image naming scheme and added log to docker build

1. go back to local code instead of cloning git
2. added build log to docker image build script, incl. log build times.
Logs can be found in `docker/dev-log` folder
3. added docker docs and new docker build logs folder to .gitignore
4. added

* build docker images from local files instead of cloned remote repo, plus time recording of builds
 - switched way docker images are built from remote git repo to local files (which should be the git repo, but may have local changes)
 - the docker build logs will show the time needed for the single image builds

* reverted deletion of joex base dockerfile

* joex base dockerfile plus smaller improvements
  - separate joex base file
  - added docker hook to improve Docker Hub experience

* updated docker hub build hook

corrected wrong path (base is build context)

* Fix of docker hub build hook again

base path seems to be the dockerfile's folder

* fixed typo in .dockerignore

* added ability to spool log to console instead of file, especially for automated docker builds

* improved logging of build script

* minor tweaks from review (.dockerignore, docker hub hook and an error when using other repos)

* added push of non-base images to automated docker hook

* fixes for docker hub build hook

* fixed/improved docker build hook

* replaced tag-version of untagged versions with SNAPSHOT (was LATEST, which should be used or stable tags only)
plus, made the version tag mandatory for the dockerfiles

* adapted docker build and push scripts for tagged images (using docker automated builds)

* fixed docker build hook
stupid copy & paste mistake...

* minor mistake in build hook

* added validation of matching version numbers for docker automated builds (for non-snapshot builds)

* fixed missing fi in new validity check

* fixed docker build hook validity check

* mixed up version comparison fixed

* relative path error in hook validation

* mixed up version comparison fixed

* test

* fixed error in version matching for docker hook

* test

* improved versioning, so that docker images are v0.00.00

* revert version.sbt

got overwritten by accidence

* reverted version.sbt

* improved environment parameters, especially enabled setting DB params by them

	- additionally added .env file to have the same env variables for all containers

* cleaned up docker-compose.yml to fit public origin repo again

* optimized way db params are set

figured out, we do not need the DB-String to be built at startup, docspell.conf reads also multiple variables.
I still kept the restserver entrypoint, although we do not need it now - it might be helpful in the future or for debugging pruposes

* added restart option  to restart docspell, e.g. after a system reboot - but only if it was running before
2020-10-19 13:56:44 +02:00
b323edc1f7 Merge pull request #344 from eikek/fix-upload-spec
Fix route in openapi spec for uploading
2020-10-19 11:55:08 +00:00
e68ee67aec Fix route in openapi spec for uploading 2020-10-19 13:45:14 +02:00
b56a94f9eb Merge pull request #342 from eikek/fix-save-existing-tag
Fix save existing tag
2020-10-18 22:46:20 +00:00
d66ae4fdc2 Display error message properly on modal edit 2020-10-19 00:30:55 +02:00
3771587e55 Find duplicate tags without category 2020-10-19 00:30:41 +02:00
6a3386ce66 Fix sql comparison with optional values 2020-10-19 00:29:41 +02:00
abb903c5ea Merge pull request #340 from eikek/fix-search-api-spec
Fix openapi spec for rest-server
2020-10-18 22:09:50 +00:00
ec0d0f8475 Fix openapi spec for rest-server
- The `itemId` parameter was not declared for
  `item/{itemId}/reprocess`
- `tagCategories*` must be declared required for `ItemSearch`
  structure
2020-10-18 23:55:56 +02:00
5c9f214f80 Merge pull request #339 from eikek/fix-detail-links
Fix detail links
2020-10-18 19:53:26 +00:00
5e0eaf419e Fix browser back button to restore scroll state
Removes the url parameter that was used to identify the card to scroll
to and instead use the id from the internal model.
2020-10-18 21:35:42 +02:00
ead2e52253 Show item name in document title 2020-10-18 14:26:18 +02:00
fc5035ea8d Use anchor links instead of javascript to go to detail view 2020-10-18 14:09:52 +02:00
791a61b24b Merge pull request #335 from scala-steward/update/scalafmt-core-2.7.5
Update scalafmt-core to 2.7.5
2020-10-16 20:51:14 +00:00
03f05293df Update scalafmt-core to 2.7.5 2020-10-16 22:37:52 +02:00
703d7c5a95 Merge pull request #334 from scala-steward/update/flyway-core-7.0.4
Update flyway-core to 7.0.4
2020-10-16 16:39:25 +00:00
19a0720a22 Update flyway-core to 7.0.4 2020-10-16 18:18:53 +02:00
8195ac50a2 Merge pull request #328 from scala-steward/update/http4s-blaze-client-0.21.8
Update http4s-blaze-client, ... to 0.21.8
2020-10-16 06:46:42 +00:00
33180e7cf5 Update http4s-blaze-client, ... to 0.21.8 2020-10-16 08:34:07 +02:00
9fd813a645 Merge pull request #324 from scala-steward/update/swagger-ui-3.35.2
Update swagger-ui to 3.35.2
2020-10-15 22:38:11 +00:00
790c519afe Update swagger-ui to 3.35.2 2020-10-16 00:25:11 +02:00
7dca00ad22 Merge pull request #321 from scala-steward/update/postgresql-42.2.18
Update postgresql to 42.2.18
2020-10-15 14:43:05 +00:00
9de30932c0 Update postgresql to 42.2.18 2020-10-15 16:30:56 +02:00
9d1d6af7f9 Merge pull request #320 from scala-steward/update/flyway-core-7.0.3
Update flyway-core to 7.0.3
2020-10-14 14:46:21 +00:00
68aa85fc71 Update flyway-core to 7.0.3 2020-10-14 16:31:51 +02:00
09d793c025 Merge pull request #319 from scala-steward/update/sbt-openapi-schema-0.7.0
Update sbt-openapi-schema to 0.7.0
2020-10-14 10:37:56 +00:00
77f29f667a Update sbt-openapi-schema to 0.7.0 2020-10-14 12:25:52 +02:00
ca1217c16b Merge pull request #317 from scala-steward/update/sbt-native-packager-1.7.6
Update sbt-native-packager to 1.7.6
2020-10-12 00:30:08 +00:00
78b4825928 Update sbt-native-packager to 1.7.6 2020-10-12 02:17:50 +02:00
3ad4d6871c Merge pull request #316 from eikek/fix-cookie-domain
Fix cookie domain
2020-10-11 16:51:34 +00:00
4ee881963e Fix cookie's secure flag based on protocol
Now, if the configured base-url is `localhost` (that is, it is left
unchanged), the request is insepected to retrieve the base-url value.
This is then used to set the `secure` cookie attribute. The `domain`
attribute has been removed from the cookie.

The notify-items task has been updated to use the same pattern for
creating absolute urls to items it its mail body.
2020-10-11 18:31:36 +02:00
df646dfabe Get the client host first from x-forwarded-host header
Then use the x-forwarded-for header (doing a reverse lookup, if
possible). At last use the Host header.
2020-10-09 23:47:07 +02:00
d4a2596b1f Merge pull request #313 from scala-steward/update/flyway-core-7.0.2
Update flyway-core to 7.0.2
2020-10-09 14:52:25 +00:00
241bba1ef8 Merge pull request #314 from scala-steward/update/postgresql-42.2.17
Update postgresql to 42.2.17
2020-10-09 14:52:19 +00:00
59e2a93942 Update postgresql to 42.2.17 2020-10-09 16:40:01 +02:00
ca721fa098 Update flyway-core to 7.0.2 2020-10-09 16:39:54 +02:00
a65e05c002 Merge pull request #310 from scala-steward/update/swagger-ui-3.35.1
Update swagger-ui to 3.35.1
2020-10-09 00:30:18 +00:00
20f9bbfd34 Update swagger-ui to 3.35.1 2020-10-09 02:17:10 +02:00
abe998b486 Merge pull request #309 from scala-steward/update/flyway-core-7.0.1
Update flyway-core to 7.0.1
2020-10-07 12:34:13 +00:00
e4a9425774 Update flyway-core to 7.0.1 2020-10-07 14:21:23 +02:00
ab9866a64f Merge pull request #307 from scala-steward/update/scalafmt-core-2.7.4
Update scalafmt-core to 2.7.4
2020-10-06 21:42:57 +00:00
3f697f51aa Autoformat 2020-10-06 23:31:09 +02:00
c57b908461 Update scalafmt-core to 2.7.4 2020-10-06 22:44:12 +02:00
24a53d6247 Merge pull request #306 from scala-steward/update/swagger-ui-3.35.0
Update swagger-ui to 3.35.0
2020-10-05 18:44:04 +02:00
6cd29ad9a9 Update swagger-ui to 3.35.0 2020-10-05 18:33:53 +02:00
899b08ecf1 Merge pull request #304 from scala-steward/update/sbt-1.4.0
Update sbt to 1.4.0
2020-10-05 10:01:31 +02:00
2e1df702e3 Update sbt to 1.4.0 2020-10-05 02:59:05 +02:00
df95513ba3 Merge pull request #302 from eikek/ui-fixes
Ui fixes
2020-10-03 01:10:52 +02:00