diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..6390025
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,26 @@
+sudo: true
+
+services:
+  - docker
+
+before_script:
+  - sudo apt-get --yes --no-install-recommends install binfmt-support qemu-user-static
+  - echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:' | sudo tee -a /proc/sys/fs/binfmt_misc/register
+
+
+jobs:
+  include:
+    - stage: build docker image
+      script:
+      - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+      - docker build -f Dockerfile.armhf -t mqtt-admin:armhf .
+      - docker images
+      - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo ""; else echo -$TRAVIS_BRANCH ; fi`
+      - docker tag mqtt-admin:armhf mqttsmarthome/mqtt-admin:armhf$TAG
+    - stage: test docker image
+      script:
+        - docker run -d mqttsmarthome/mqtt-admin:armhf$TAG
+        - docker ps | grep armhf
+after_success:
+    - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+    - docker push mqttsmarthome/mqtt-admin:armhf$TAG
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..91328f0
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,23 @@
+FROM library/nginx:latest
+LABEL maintainer="Holger Imbery <contact@connectedobjects.cloud>" \
+      version="1.1" \
+      description="mqtt-admin dockerized version of https://github.com/hobbyquaker/mqtt-admin"
+
+RUN apt-get update \
+ && apt-get install -y -q --no-install-recommends unzip \
+    ca-certificates \
+    bash \
+    nginx \
+    unzip \
+ && apt-get clean \
+ && rm -r /var/lib/apt/lists/*
+
+ENV DOCKER_HOST unix:///tmp/docker.sock
+ADD https://github.com/hobbyquaker/mqtt-admin/releases/download/v1.0.0/mqtt-admin_1.0.0.zip .
+RUN unzip mqtt-admin_1.0.0.zip -d /usr/share/nginx/html
+RUN cp -R /usr/share/nginx/html/mqtt-admin/* /usr/share/nginx/html
+RUN rm -rf /usr/share/nginx/html/mqtt-admin
+RUN rm /mqtt-admin_1.0.0.zip
+
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
new file mode 100644
index 0000000..dda5903
--- /dev/null
+++ b/Dockerfile.armhf
@@ -0,0 +1,23 @@
+FROM resin/rpi-raspbian
+LABEL maintainer="Holger Imbery <contact@connectedobjects.cloud>" \
+      version="1.1" \
+      description="mqtt-admin dockerized version of https://github.com/hobbyquaker/mqtt-admin"
+
+RUN apt-get update \
+ && apt-get install -y -q --no-install-recommends \
+    ca-certificates \
+    bash \
+    nginx \
+    unzip \
+ && apt-get clean \
+ && rm -r /var/lib/apt/lists/*
+
+ENV DOCKER_HOST unix:///tmp/docker.sock
+ADD https://github.com/hobbyquaker/mqtt-admin/releases/download/v1.0.0/mqtt-admin_1.0.0.zip .
+RUN unzip mqtt-admin_1.0.0.zip -d /var/www/html
+RUN cp -R /var/www/html/mqtt-admin/* /var/www/html
+RUN rm -rf /usr/share/nginx/html/mqtt-admin
+RUN rm /mqtt-admin_1.0.0.zip
+
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]