diff --git a/build.gradle b/build.gradle index 3c6e9a9..b43b38c 100644 --- a/build.gradle +++ b/build.gradle @@ -133,8 +133,8 @@ dependencies { implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.0' // ADempiere Core implementation "${baseGroupId}:base:${baseVersion}" - implementation "${baseGroupId}:adempiere-grpc-utils:1.0.6" - implementation "${baseGroupId}:adempiere-business-processors:1.0.9" + implementation "${baseGroupId}:adempiere-grpc-utils:1.1.2" + implementation "${baseGroupId}:adempiere-business-processors:1.1.0" // Others compileOnly 'org.apache.tomcat:annotations-api:6.0.53' } diff --git a/docker-compose/.env b/docker-compose/.env index 3a87362..614cd87 100644 --- a/docker-compose/.env +++ b/docker-compose/.env @@ -21,4 +21,15 @@ ADEMPIERE_NETWORK="adempiere-processor.adempiere_network" ENVOY_NAME="adempiere-processor.grpc.proxy" ENVOY_IMAGE_NAME="envoyproxy/envoy:v1.27.0" ENVOY_VOLUME="volume_envoy" -ENVOY_PORT=5555 \ No newline at end of file +ENVOY_PORT=5555 + +DKRON_IMAGE="dkron/dkron" +DKRON_HOST="adempiere-processor.dkron" +DKRON_PORT=8080 +DKRON_VOLUME="adempiere-processor.volume_dkron" + +RUNDECK_IMAGE="rundeck/rundeck:4.12.0" +RUNDECK_HOST="adempiere-processor.rundeck" +RUNDECK_PORT=4440 +RUNDECK_REALM_SETTING="./rundeck/realm.properties" +RUNDECK_USER_POLICIES="./rundeck/user.aclpolicy" \ No newline at end of file diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index be70855..a1fd1cd 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -41,6 +41,35 @@ services: networks: - shared_network + dkron-scheduler: + image: ${DKRON_IMAGE} + container_name: ${DKRON_HOST} + restart: ${GENERIC_RESTART} + ports: + - ${DKRON_PORT}:8080 + command: + - "agent" + - "--bootstrap-expect=1" + - "--node-name=node1" + - "--server" + - "--ui=false" + volumes: + - volume_dkron:/dkron.data + networks: + - shared_network + + rundeck-scheduler: + container_name: ${RUNDECK_HOST} + image: ${RUNDECK_IMAGE} + restart: ${GENERIC_RESTART} + ports: + - ${RUNDECK_PORT}:4440 + volumes: + - ${RUNDECK_REALM_SETTING}:/home/rundeck/server/config/realm.properties + - ${RUNDECK_USER_POLICIES}:/home/rundeck/etc/user.aclpolicy + networks: + - shared_network + grpc.proxy: image: ${ENVOY_IMAGE_NAME} container_name: ${ENVOY_NAME} @@ -61,3 +90,5 @@ networks: volumes: volume_postgres: name: ${POSTGRES_VOLUME} + volume_dkron: + name: ${DKRON_VOLUME} diff --git a/docker-compose/rundeck/user.aclpolicy b/docker-compose/rundeck/user.aclpolicy new file mode 100644 index 0000000..8d9d27c --- /dev/null +++ b/docker-compose/rundeck/user.aclpolicy @@ -0,0 +1,25 @@ +description: Basic Access +context: + application: 'rundeck' +by: + group: 'user' +for: + project: + - equals: + name: 'sell-in-sell-out' + allow: [read] +--- +description: Project Access +context: + project: 'sell-in-sell-out' +by: + group: 'user' +for: + job: + - allow: [read,run,runAs,kill,killAs] # allow create/read/write/delete/run/kill of all jobs + node: + - allow: [read,run] + adhoc: + - allow: 'read' + resource: + - allow: 'read' \ No newline at end of file