diff --git a/.hub.cli.dockerfile b/.hub.cli.dockerfile
new file mode 100644
index 00000000000..a3686f52ee3
--- /dev/null
+++ b/.hub.cli.dockerfile
@@ -0,0 +1,36 @@
+## The builder labeled image acts as a transient container which is meant to
+## hold all non-artifact code.
+##
+## You can build _just_ this part with:
+##     docker --target builder -t container-name:builder -f .hub.cli.dockerfile .
+FROM jimschubert/8-jdk-alpine-mvn:1.0 as builder
+
+RUN set -x && \
+    apk add --no-cache bash
+
+ENV GEN_DIR /opt/openapi-generator
+WORKDIR ${GEN_DIR}
+COPY . ${GEN_DIR}
+
+# Pre-compile openapi-generator-cli
+RUN mvn -am -pl "modules/openapi-generator-cli" package
+
+## The final (release) image
+## The resulting container here only needs the target jar
+## and ca-certificates (to be able to query HTTPS hosted specs)
+FROM openjdk:8-jre-alpine
+
+ENV GEN_DIR /opt/openapi-generator
+
+RUN apk --no-cache add ca-certificates bash
+RUN mkdir -p ${GEN_DIR}/modules/openapi-generator-cli/target
+
+WORKDIR ${GEN_DIR}/modules/openapi-generator-cli/target
+
+COPY --from=builder ${GEN_DIR}/modules/openapi-generator-cli/target/openapi-generator-cli.jar ${GEN_DIR}/modules/openapi-generator-cli/target/openapi-generator-cli.jar
+
+COPY docker-entrypoint.sh /usr/local/bin/
+
+ENTRYPOINT ["docker-entrypoint.sh"]
+
+CMD ["help"]
diff --git a/.hub.online.dockerfile b/.hub.online.dockerfile
new file mode 100644
index 00000000000..96eda34d32b
--- /dev/null
+++ b/.hub.online.dockerfile
@@ -0,0 +1,35 @@
+## The builder labeled image acts as a transient container which is meant to
+## hold all non-artifact code.
+##
+## You can build _just_ this part with:
+##     docker --target builder -t container-name:builder -f .hub.online.dockerfile .
+FROM jimschubert/8-jdk-alpine-mvn:1.0 as builder
+
+RUN set -x && \
+    apk add --no-cache bash
+
+ENV GEN_DIR /opt/openapi-generator
+WORKDIR ${GEN_DIR}
+COPY . ${GEN_DIR}
+
+# Pre-compile openapi-generator-online
+RUN mvn -am -pl "modules/openapi-generator-online" package
+
+## The final (release) image
+## The resulting container here only needs the target jar
+FROM openjdk:8-jre-alpine
+
+ENV GEN_DIR /opt/openapi-generator
+ENV TARGET_DIR /generator
+
+RUN mkdir -p ${TARGET_DIR}
+
+WORKDIR ${TARGET_DIR}
+
+COPY --from=builder ${GEN_DIR}/modules/openapi-generator-online/target/openapi-generator-*.jar ${TARGET_DIR}/openapi-generator-online.jar
+
+ENV GENERATOR_HOST=http://localhost
+
+EXPOSE 8080
+
+CMD ["java", "-jar", "/generator/openapi-generator-online.jar"]