From 2245c7ca402b843808b1904bd1dd093af30f498e Mon Sep 17 00:00:00 2001 From: Krystian Panek Date: Tue, 10 Dec 2019 14:38:26 +0100 Subject: [PATCH 1/2] Duckrails poc --- aem/build.gradle.kts | 8 +++++++- aem/gradle/environment/docker-compose.yml.peb | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/aem/build.gradle.kts b/aem/build.gradle.kts index c71ac180..9c2828a2 100644 --- a/aem/build.gradle.kts +++ b/aem/build.gradle.kts @@ -30,6 +30,11 @@ aem { watchConfigDir("conf") } } + "duckrails" { + resolve { + ensureDir() + } + } } } hosts { @@ -69,7 +74,8 @@ aem { packages { // "dep.vanity-urls"("pkg/vanityurls-components-1.0.2.zip") "dep.kotlin"("org.jetbrains.kotlin:kotlin-osgi-bundle:${Build.KOTLIN_VERSION}") - "dep.acs-aem-commons"("https://github.com/Adobe-Consulting-Services/acs-aem-commons/releases/download/acs-aem-commons-4.0.0/acs-aem-commons-content-4.0.0-min.zip") + "dep.core-components-all"("com.adobe.cq:core.wcm.components.all:2.8.0@zip") + "dep.core-components-examples"("com.adobe.cq:core.wcm.components.examples:2.8.0@zip") "tool.ac-tool"("https://repo1.maven.org/maven2/biz/netcentric/cq/tools/accesscontroltool", "accesscontroltool-package/2.3.2/accesscontroltool-package-2.3.2.zip", "accesscontroltool-oakindex-package/2.3.2/accesscontroltool-oakindex-package-2.3.2.zip") "tool.aem-easy-content-upgrade"("https://github.com/valtech/aem-easy-content-upgrade/releases/download/2.0.0/aecu.bundle-2.0.0.zip") "tool.search-webconsole-plugin"("com.neva.felix:search-webconsole-plugin:1.2.0") diff --git a/aem/gradle/environment/docker-compose.yml.peb b/aem/gradle/environment/docker-compose.yml.peb index 3b91eb0d..e4a70c1a 100644 --- a/aem/gradle/environment/docker-compose.yml.peb +++ b/aem/gradle/environment/docker-compose.yml.peb @@ -22,5 +22,17 @@ services: extra_hosts: - "host.docker.internal:{{ docker.runtime.hostInternalIp }}" {% endif %} + duckrails: + image: iridakos/duckrails:release-v2.1.5 + deploy: + replicas: 1 + restart_policy: + condition: on-failure + ports: + - "8080:80" + networks: + - docker-net + volumes: + - "{{ docker.rootPath }}/duckrails:/opt/duckrails/db" networks: docker-net: From 7d7ebb9fb0285715c83a817a194ba38de4146b80 Mon Sep 17 00:00:00 2001 From: Krystian Panek Date: Tue, 10 Dec 2019 14:40:25 +0100 Subject: [PATCH 2/2] Cleanup --- aem/build.gradle.kts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/aem/build.gradle.kts b/aem/build.gradle.kts index 9c2828a2..40295d47 100644 --- a/aem/build.gradle.kts +++ b/aem/build.gradle.kts @@ -74,8 +74,7 @@ aem { packages { // "dep.vanity-urls"("pkg/vanityurls-components-1.0.2.zip") "dep.kotlin"("org.jetbrains.kotlin:kotlin-osgi-bundle:${Build.KOTLIN_VERSION}") - "dep.core-components-all"("com.adobe.cq:core.wcm.components.all:2.8.0@zip") - "dep.core-components-examples"("com.adobe.cq:core.wcm.components.examples:2.8.0@zip") + "dep.acs-aem-commons"("https://github.com/Adobe-Consulting-Services/acs-aem-commons/releases/download/acs-aem-commons-4.0.0/acs-aem-commons-content-4.0.0-min.zip") "tool.ac-tool"("https://repo1.maven.org/maven2/biz/netcentric/cq/tools/accesscontroltool", "accesscontroltool-package/2.3.2/accesscontroltool-package-2.3.2.zip", "accesscontroltool-oakindex-package/2.3.2/accesscontroltool-oakindex-package-2.3.2.zip") "tool.aem-easy-content-upgrade"("https://github.com/valtech/aem-easy-content-upgrade/releases/download/2.0.0/aecu.bundle-2.0.0.zip") "tool.search-webconsole-plugin"("com.neva.felix:search-webconsole-plugin:1.2.0")