diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..dfb18a0
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,61 @@
+# backend build (api server)
+FROM golang:1.10.2-alpine AS api-build
+
+COPY ./api /go/src/commento-ce/api
+WORKDIR /go/src/commento-ce/api
+
+RUN apk update && apk add bash make git
+RUN go get -v
+
+RUN make prod
+
+
+# frontend build (html, js, css, images)
+FROM node:10.3.0-alpine AS frontend-build
+
+COPY ./frontend /commento-ce/frontend/
+WORKDIR /commento-ce/frontend/
+
+RUN apk update && apk add bash make
+RUN npm install -g html-minifier uglify-js sass
+
+RUN make prod
+
+
+# templates build
+FROM alpine:3.7 AS templates-build
+
+COPY ./templates /commento-ce/templates
+WORKDIR /commento-ce/templates
+
+RUN apk update && apk add bash make
+
+RUN make prod
+
+
+# db build
+FROM alpine:3.7 AS db-build
+
+COPY ./db /commento-ce/db
+WORKDIR /commento-ce/db
+
+RUN apk update && apk add bash make
+
+RUN make prod
+
+
+# final image
+FROM alpine:3.7
+
+COPY --from=api-build /go/src/commento-ce/api/build/prod/commento-ce /commento-ce/commento-ce
+COPY --from=frontend-build /commento-ce/frontend/build/prod/*.html /commento-ce/
+COPY --from=frontend-build /commento-ce/frontend/build/prod/css/*.css /commento-ce/css/
+COPY --from=frontend-build /commento-ce/frontend/build/prod/js/*.js /commento-ce/js/
+COPY --from=frontend-build /commento-ce/frontend/build/prod/images/* /commento-ce/images/
+COPY --from=templates-build /commento-ce/templates/build/prod/templates/ /commento-ce/templates/
+COPY --from=db-build /commento-ce/db/build/prod/db/ /commento-ce/db/
+
+EXPOSE 8080
+
+WORKDIR /commento-ce/
+ENTRYPOINT ["/commento-ce/commento-ce"]
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..e354387
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,33 @@
+version: '3'
+
+services:
+  server:
+    build: .
+    ports:
+      - 8080:8080
+    environment:
+      COMMENTO_ORIGIN: http://192.168.0.172:8080
+      COMMENTO_PORT: 8080
+      COMMENTO_POSTGRES: postgres://postgres:postgres@db:5432/commento?sslmode=disable
+    depends_on:
+      - db
+    networks:
+      - db_network
+  db:
+    image: postgres
+    environment:
+      POSTGRES_DB: commento
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+    ports:
+      - 5432:5432
+    networks:
+      - db_network
+    volumes:
+      - postgres_data_volume:/var/lib/postgres
+
+networks:
+  db_network:
+
+volumes:
+  postgres_data_volume: