TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-02-06 01:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
d1df559022
docspell/docker/consumedir.dockerfile

22 lines
561 B
Plaintext
Raw Normal View History

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 11:56:44 +00:00
## CONSUMEDIR
Add a docker image for watching a directory
2020-05-25 17:43:06 +00:00
Move consumedir entrypoint to docker and fix compose setup To make it work as before, some env variables are necessary to be available to the consumedir container. It's only needed there, but since the env file exists, they are now listed there. Also partially reverts the consumedir.dockerfile. Using the base-image makes sure that all build images are created from the same sources.
2021-01-28 21:31:58 +00:00
ARG VERSION=
ARG REPO=
# hack to use args in from
FROM ${REPO}:base-binaries-${VERSION} as docspell-base-binaries
FROM ${REPO}:base-${VERSION}
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 11:56:44 +00:00
RUN apk add --no-cache curl bash inotify-tools
Move consumedir entrypoint to docker and fix compose setup To make it work as before, some env variables are necessary to be available to the consumedir container. It's only needed there, but since the env file exists, they are now listed there. Also partially reverts the consumedir.dockerfile. Using the base-image makes sure that all build images are created from the same sources.
2021-01-28 21:31:58 +00:00
COPY --from=docspell-base-binaries /opt/docspell-tools /opt/docspell-tools
COPY consumedir-entrypoint.sh /opt/docspell-tools/consumedir/
RUN chmod 755 /opt/docspell-tools/**/*.sh
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 11:56:44 +00:00
Move consumedir entrypoint to docker and fix compose setup To make it work as before, some env variables are necessary to be available to the consumedir container. It's only needed there, but since the env file exists, they are now listed there. Also partially reverts the consumedir.dockerfile. Using the base-image makes sure that all build images are created from the same sources.
2021-01-28 21:31:58 +00:00
ENTRYPOINT ["bash", "/opt/docspell-tools/consumedir/consumedir-entrypoint.sh"]
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 11:56:44 +00:00
HEALTHCHECK --interval=1m --timeout=10s --retries=2 --start-period=10s \
Simplify consumedir.dockerfile
2021-01-27 20:40:36 +00:00
CMD pgrep bash
Reference in New Issue Copy Permalink