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.

Sign up for GitHub

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

changes for improved kitodo docker compose #23

Merged
merged 46 commits into from
Jun 27, 2022
Merged

changes for improved kitodo docker compose #23

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
64f599e
changes for improved kitodo docker compose
markusweigelt Jun 8, 2022
54195a1
Merge branch 'main' into changes_for_kitodo
markusweigelt Jun 13, 2022
ddbd0a9
split implicit stop rules
bertsky Jun 13, 2022
42cb02f
changes for improved kitodo docker compose
markusweigelt Jun 8, 2022
6f2721d
improvements of kitodo-app and -builder to use with make files
markusweigelt Jun 13, 2022
fc5ba37
Merge branch 'changes_for_kitodo' of github.com:markusweigelt/kitodo_…
markusweigelt Jun 13, 2022
1ac829b
improve makefile and fix path problems using BUILDER_BUILD_RESOURCES
markusweigelt Jun 14, 2022
62d9682
remove symlink and add file again
markusweigelt Jun 14, 2022
b12b1d8
add kitodo app file
markusweigelt Jun 14, 2022
d3fe2ae
change builder path variable
markusweigelt Jun 14, 2022
1670698
use active mq config of submodule repository
markusweigelt Jun 14, 2022
c2c5a1d
simplify 'build' rules and COMPOSE_FILE def
bertsky Jun 14, 2022
a45f8be
example resources only contains diff to generate resources of kitodo …
markusweigelt Jun 16, 2022
fa47b14
revert . to PWD as relative basedir for volumes in .env
bertsky Jun 16, 2022
1050f8c
update submodule
markusweigelt Jun 16, 2022
b3872d3
Merge branch 'changes_for_kitodo' of github.com:markusweigelt/kitodo_…
markusweigelt Jun 16, 2022
9c9a227
submodule to head of kitodo-production-docker
markusweigelt Jun 17, 2022
97792fa
updata resources and ignore unzipped data directory
markusweigelt Jun 17, 2022
5aa4672
update manager module
markusweigelt Jun 17, 2022
9458dd6
revert more . to PWD (finish fa47b14bd)
bertsky Jun 17, 2022
f2b8e2b
update submodule
markusweigelt Jun 17, 2022
7c1eb51
Merge branch 'changes_for_kitodo' of github.com:markusweigelt/kitodo_…
markusweigelt Jun 17, 2022
3d2ef95
update submodule
markusweigelt Jun 17, 2022
e4b15a6
changed scripts/script_ocr.sh
markusweigelt Jun 22, 2022
7e63457
change unzip data to /data/data
markusweigelt Jun 22, 2022
2692e9c
make build-kitodo: run in fg, avoid orphans
bertsky Jun 23, 2022
5ab9615
Kitodo builder: use absolute path for Docker context
bertsky Jun 23, 2022
13f48dc
Merge branch 'changes_for_kitodo' of https://github.com/markusweigelt…
bertsky Jun 23, 2022
711b134
add docker-compose down of kitodo builder
markusweigelt Jun 23, 2022
a25fb32
Merge branch 'changes_for_kitodo' of github.com:markusweigelt/kitodo_…
markusweigelt Jun 23, 2022
4087886
update submodule
markusweigelt Jun 23, 2022
9d320e4
update submodule
markusweigelt Jun 23, 2022
fd90bc8
update submodule
markusweigelt Jun 23, 2022
0613d8b
improve documentation
markusweigelt Jun 23, 2022
1ba466a
revert changes to .env in 0613d8b55
bertsky Jun 23, 2022
1b810b8
remove unused env variables
markusweigelt Jun 24, 2022
2e6fcdb
submodule update
markusweigelt Jun 24, 2022
5449356
consider .env.local if exist
markusweigelt Jun 24, 2022
183fe11
formatting -> remove tabs
markusweigelt Jun 24, 2022
5caf177
update submodule
markusweigelt Jun 24, 2022
90947f9
update submodule
markusweigelt Jun 24, 2022
8b19c98
add env file parameter to docker-compose of build target
markusweigelt Jun 24, 2022
f6aa987
add env variable and update submodule
markusweigelt Jun 24, 2022
9eab6fc
update resource data zip and submodule
markusweigelt Jun 24, 2022
8f90aff
remove handling of .env.local and --env-file parameter of docker-comp…
markusweigelt Jun 24, 2022
2bd8fcb
submodule update
markusweigelt Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/ocrd/*
/kitodo/*
*.iml
_resources/data/*
_resources/data/*
.env.local
18 changes: 12 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ CONTROLLER_ENV_GID ?= $(shell id -g)
MANAGER_ENV_UID ?= $(shell id -u)
MANAGER_ENV_GID ?= $(shell id -g)

ifeq ($(shell test -e .env.local && echo -n yes),yes)
COMPOSE_ENV_FILE ?= .env.local
else
COMPOSE_ENV_FILE ?= .env
endif

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Less verbose version:

Suggested change
ifeq ($(shell test -e .env.local && echo -n yes),yes)
COMPOSE_ENV_FILE ?= .env.local
else
COMPOSE_ENV_FILE ?= .env
endif
COMPOSE_ENV_FILE = $(firstword $(wildcard .env.local .env))

MODE ?= managed
ifeq (managed,$(MODE))
COMPOSE_FILE = docker-compose.yml:docker-compose.kitodo-app.yml:docker-compose.managed.yml
Expand Down Expand Up @@ -49,20 +55,20 @@ build: build-keys build-kitodo build-examples
touch -m $@

start:
docker-compose up -d --build
docker-compose --env-file=$(COMPOSE_ENV_FILE) up -d --build

down:
docker-compose down
docker-compose -f ./docker-compose.kitodo-builder.yml down
docker-compose --env-file=$(COMPOSE_ENV_FILE) down
docker-compose --env-file=$(COMPOSE_ENV_FILE) -f ./docker-compose.kitodo-builder.yml down

stop:
docker-compose stop
docker-compose --env-file=$(COMPOSE_ENV_FILE) stop

config:
docker-compose config
docker-compose --env-file=$(COMPOSE_ENV_FILE) config

status:
docker-compose ps
docker-compose --env-file=$(COMPOSE_ENV_FILE) ps

define HELP
cat <<"EOF"
Expand Down