diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..adfc652a
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,12 @@
+image: docker:git
+
+stages:
+  - docker
+
+job_docker:
+  stage: docker
+  services:
+    - docker:dind
+  script: sh ./upload-docker.sh
+  only:
+    - master
diff --git a/upload-docker.sh b/upload-docker.sh
new file mode 100755
index 00000000..3f45fbf1
--- /dev/null
+++ b/upload-docker.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+VERSION=$CI_COMMIT_REF_NAME
+PROJECT_PATH=`echo "$CI_PROJECT_PATH" | tr '[:upper:]' '[:lower:]'`
+echo $PROJECT_PATH $VERSION
+docker build -t registry.gitlab.com/$PROJECT_PATH:$VERSION .
+rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
+echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
+
+docker push registry.gitlab.com/$PROJECT_PATH:$VERSION
+if [[ "$VERSION" == "master" ]]
+then
+  echo "master detected"
+  docker tag registry.gitlab.com/$PROJECT_PATH:$VERSION registry.gitlab.com/$PROJECT_PATH:latest
+  docker push registry.gitlab.com/$PROJECT_PATH:latest
+fi