release 0.12.0

malaskowski · Aug 27, 2019 · dde28c9 · dde28c9
1 parent 2504164
commit dde28c9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,11 @@
 # Not released yet
+Nothing now :)
+
+# 0.12.0
 - [PR-11](https://github.com/Skejven/aet-docker/pull/11) Report docker image base changed from Ubuntu to `httpd` Alpine (`386 MB` to `150 MB`)
 - Removed suite generator from the report image (it lacks Open Source license)
 - [PR-12](https://github.com/Skejven/aet-docker/pull/12) introduces [AET Lighthouse Extension](https://github.com/Skejven/aet-lighthouse-extension) to the aet example swarm stack
+- AET Version upgraded to [`3.3.0`](https://github.com/Cognifide/aet/releases/tag/3.3.0) release
 
 # 0.11.0
 - AET Version upgraded to [`3.2.2`](https://github.com/Cognifide/aet/releases/tag/3.2.2) release

diff --git a/example-aet-swarm/README.md b/example-aet-swarm/README.md
@@ -8,7 +8,7 @@ AET stack defined in this example runs:
 - AET ActiveMq container
 - AET Browsermob container
 - AET Apache Karaf container with AET core installed (Runner, Workers, Web-API, Datastorage, Executor)
-- AET Apache Server container with AET Report and [AET suite generator](https://github.com/m-suchorski/suite-generator/tree/feature/suite)
+- AET Apache Server container with AET Report.
 
 ## Lighthouse
 You may configure this AET instance to run Lighthouse reports with [AET Lighthouse Extension](https://github.com/Skejven/aet-lighthouse-extension).

diff --git a/example-aet-swarm/aet-swarm.yml b/example-aet-swarm/aet-swarm.yml
@@ -77,22 +77,22 @@ services:
       - private
 
   activemq:
-    image: skejven/aet_activemq:0.11.0
+    image: skejven/aet_activemq:0.12.0
     ports:
       - "8161:8161"
     networks:
       - private
 
   browsermob:
-   image: skejven/aet_browsermob:0.11.0
+   image: skejven/aet_browsermob:0.12.0
    ports:
     - "8080:8080"
     - "8281-8681:8281-8681"
    networks:
      - private
 
   karaf:
-    image: skejven/aet_karaf:0.11.0
+    image: skejven/aet_karaf:0.12.0
     healthcheck:
       test: curl -v --silent http://karaf:karaf@localhost:8181/system/console/bundles 2>&1 | grep -Fq "204 bundles in total - all 204 bundles active" || exit 1
       interval: 1m
@@ -115,7 +115,7 @@ services:
       - private
 
   report:
-    image: skejven/aet_report:0.11.0
+    image: skejven/aet_report:0.12.0
     ports:
       - "80:80"
 #    volumes:

diff --git a/karaf/Dockerfile b/karaf/Dockerfile
@@ -29,7 +29,7 @@ ARG KARAF_VERSION="4.2.0"
 ARG KARAF_DOWNLOAD_SHA512="431ca85af2cc230ffb6ab996cb12034a940e21ac4d03ac04936a4ab5e902c7a4e767f06ad32796d250a30ce090aa1b39d927d84955400803e3ee4e3f5116fea4"
 ARG KARAF_DOWNLOAD_URL="http://archive.apache.org/dist/karaf/${KARAF_VERSION}/apache-karaf-${KARAF_VERSION}.tar.gz"
 
-ARG AET_VERSION="3.2.2"
+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}"
 
@@ -64,7 +64,7 @@ ENV JAVA_MIN_MEM 256m
 ENV KARAF_EXEC exec
 
 # Set the build params
-ARG AET_VERSION="3.2.2"
+ARG AET_VERSION="3.3.0"
 ARG AET_ARTIFACT="bundles.zip"
 ARG AET_ARTIFACT_DOWNLOAD_URL="https://github.com/Cognifide/aet/releases/download/${AET_VERSION}/${AET_ARTIFACT}"
 

diff --git a/report/Dockerfile b/report/Dockerfile
@@ -21,7 +21,7 @@ LABEL maintainers="Jan Helak <https://github.com/heljan>, Maciej Laskowski <skej
 
 
 # set the build params
-ARG AET_VERSION="3.2.2"
+ARG AET_VERSION="3.3.0"
 ARG AET_ARTIFACT="report.zip"
 ARG AET_ARTIFACT_DOWNLOAD_URL="https://github.com/Cognifide/aet/releases/download/${AET_VERSION}/${AET_ARTIFACT}"
 
@@ -53,6 +53,6 @@ RUN wget -O /tmp/${AET_ARTIFACT} ${AET_ARTIFACT_DOWNLOAD_URL} \
   && rm /tmp/${AET_ARTIFACT}
 
 # Add all extra files
-COPY extra /var/www/html
+COPY extra ${APACHE_WWW_DIR}
 
 RUN chown -R ${APACHE_USER}:${APACHE_USER} ${APACHE_WWW_DIR}