Merge pull request #27 from Skejven/feature/karaf-provisioned-with-deps

Karaf image with all deps

Author: Skejven

CHANGELOG.md

@@ -1,4 +1,5 @@
 # Not released yet
+- [PR-27](https://github.com/Skejven/aet-docker/pull/27) - Karaf provisioned with all dependencies - offline mode provisioning support.
 - [PR-26](https://github.com/Skejven/aet-docker/pull/26) - AET Docker client for running AET suites with no dependencies but Docker
 - [PR-22](https://github.com/Skejven/aet-docker/pull/22) - changed no of Selenium Grid Nodes replicas in order to improve tests results stability.
 - [PR-23](https://github.com/Skejven/aet-docker/pull/23) - updated mongodb image version to `3.6`. **Important**: if you are upgrading AET from the version that used mongo 3.2, please read carefully upgrade notes before migrating. Updated docker swarm schema to `3.7`.

README.md

@@ -50,8 +50,9 @@ Hosts [Apache ActiveMQ](http://activemq.apache.org/) that is used as the communi
 Hosts BrowserMob proxy that is used by AET to collect status codes and inject headers to requests.
 ### AET Karaf
 Hosts [Apache Karaf](https://karaf.apache.org/) OSGi applications container.
-It contains all AET modules (bundles): Runner, Workers, Web-API, Datastorage, Executor, Cleaner and runs them within OSGi context.
-This container contains [AET application core](https://github.com/Cognifide/aet) in the `/aet/core` directory.
+It contains all AET modules (bundles): Runner, Workers, Web-API, Datastorage, Executor, Cleaner and runs them within OSGi context
+with all their dependencies required (no internet access required to provision).
+[AET application core](https://github.com/Cognifide/aet) is located in the `/aet/core` directory.
 All custom AET extensions are kept in the `/aet/custom` directory.
 ### AET Report 
 Runs [Apache Server](https://httpd.apache.org/) that hosts [AET Report](https://github.com/Cognifide/aet/wiki/SuiteReport).

example-aet-swarm/README.md

@@ -23,7 +23,7 @@ AET stack defined in this example runs:
 │   ├── ...
 │   └── com.github.skejven.collector.LighthouseCollectorFactory.cfg
 ├── features
-│   └── healthcheck-features.xml
+│   └── custom-features.xml
 └── report
 ```
 

example-aet-swarm/features/README.md

@@ -0,0 +1 @@
+# Put custom AET features here, it will extend the existing features.

karaf/Dockerfile

@@ -33,7 +33,7 @@ ARG AET_VERSION="3.3.0"
 ARG AET_ARTIFACT="features.zip"
 ARG AET_ARTIFACT_DOWNLOAD_URL="https://github.com/Cognifide/aet/releases/download/${AET_VERSION}/${AET_ARTIFACT}"
 
-RUN apk add --update bash tar jq curl && rm -rf /var/cache/apk/*
+RUN apk add --update bash tar jq curl tree && rm -rf /var/cache/apk/*
 
 RUN curl -fSL -o /tmp/apache-karaf.tar.gz ${KARAF_DOWNLOAD_URL} \
     && echo "${KARAF_DOWNLOAD_SHA512}  /tmp/apache-karaf.tar.gz" | sha512sum -c - \
@@ -42,12 +42,15 @@ RUN curl -fSL -o /tmp/apache-karaf.tar.gz ${KARAF_DOWNLOAD_URL} \
     && rm /tmp/apache-karaf.tar.gz \
     && mkdir -p /opt/karaf/data /opt/karaf/data/log \
     && echo org.ops4j.pax.url.mvn.defaultRepositories = file:///opt/maven/repository@id=local.app@snapshots  >> /opt/karaf/etc/org.ops4j.pax.url.mvn.cfg \
-    && sed -i "s+http://+https://+g" /opt/karaf/etc/org.ops4j.pax.url.mvn.cfg
+    && sed -i "s+http://+https://+g" /opt/karaf/etc/org.ops4j.pax.url.mvn.cfg \
+    && echo org.ops4j.pax.url.mvn.localRepository = file:///home/karaf/.m2/repository  >> /opt/karaf/etc/org.ops4j.pax.url.mvn.cfg
 
 # download and unzip AET features
 RUN curl -fSL -o /tmp/${AET_ARTIFACT} ${AET_ARTIFACT_DOWNLOAD_URL} \
   && unzip -o /tmp/${AET_ARTIFACT} -d /opt/karaf/deploy && rm /tmp/${AET_ARTIFACT}
 
+COPY features/aet-healthcheck-features.xml /opt/karaf/deploy/aet-healthcheck-features.xml
+
 # Run karaf and wait until it downloads all features
 COPY provision-karaf.sh /tmp/provision-karaf.sh
 RUN chmod a+x /tmp/provision-karaf.sh && sync && /tmp/provision-karaf.sh
@@ -76,6 +79,9 @@ RUN apk add --update bash jq curl tar && rm -rf /var/cache/apk/*
 
 COPY --from=build /opt/karaf /opt/karaf
 
+COPY --from=build /home/karaf/.m2/repository /home/karaf/.m2/repository
+RUN chown -R ${KARAF_USER}.${KARAF_USER} /home/karaf/.m2
+
 # Copy Karaf config to watch for AET artifacts
 COPY etc/*.cfg /opt/karaf/etc/
 
@@ -94,9 +100,7 @@ RUN mv /opt/karaf/deploy/aet-*.xml /aet/core/features \
   && chown -R ${KARAF_USER}.${KARAF_USER} /aet/core/features \
   && chown -R ${KARAF_USER}.${KARAF_USER} /aet/extra/features
 
-RUN chown -R ${KARAF_USER}.${KARAF_USER} /opt/karaf \
-    && echo org.ops4j.pax.url.mvn.defaultRepositories = file:///opt/maven/repository@id=local.app@snapshots  >> /opt/karaf/etc/org.ops4j.pax.url.mvn.cfg \
-    && sed -i "s+http://+https://+g" /opt/karaf/etc/org.ops4j.pax.url.mvn.cfg
+RUN chown -R ${KARAF_USER}.${KARAF_USER} /opt/karaf
 
 EXPOSE 1099 8101 8181 44444
 

…-swarm/features/healthcheck-features.xml …af/features/aet-healthcheck-features.xmlexample-aet-swarm/features/healthcheck-features.xml renamed to karaf/features/aet-healthcheck-features.xml example-aet-swarm/features/healthcheck-features.xml renamed to karaf/features/aet-healthcheck-features.xml

@@ -27,19 +27,24 @@ get_bundles_status() {
   curl -s ${KARAF_URL} | jq '.status'
 }
 
-echo "Start waiting for Karaf to load features - up to 200 seconds, waiting for 187 active bundles"
+echo "Start waiting for Karaf to load features - up to 200 seconds, waiting for 189 active bundles"
 
 /opt/karaf/bin/karaf run &
 
 for i in $(seq 0 60);
 do
   sec=$((5 * $i))
-  if curl -s ${KARAF_URL} 2>&1 | jq '.status' | grep -Fq "187 bundles active";
+  if curl -s ${KARAF_URL} 2>&1 | jq '.status' | grep -Fq "189 bundles active";
   then
     echo "Karaf loading finished after $sec seconds";
     get_bundles_status
     /opt/karaf/bin/karaf stop
     echo "Status: $(/opt/karaf/bin/karaf status)"
+
+    echo "*****  /home/karaf/.m2/repository  ****"
+    tree /home/karaf/.m2/repository
+    echo "***************************************"
+
     exit 0;
   else
     status_code=$(get_status_code)