diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..12c776b
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,33 @@
+.dockerignore
+docker-compose.yml
+docker-compose.*.yml
+
+# Ignore git, but keep git HEAD and refs to access current commit hash if needed:
+#
+# $ cat .git/HEAD | awk '{print ".git/"$2}' | xargs cat
+# d0b8727759e1e0e7aa3d41707d12376e373d5ecc
+.git
+!.git/HEAD
+!.git/refs
+
+# Common development/test artifacts
+/cover/
+/doc/
+/test/
+/tmp/
+/.elixir_ls
+/.elixir-tools/
+
+# Mix artifacts
+/_build/
+/deps/
+*.ez
+
+# Generated on crash by the VM
+erl_crash.dump
+
+# Static artifacts - These should be fetched and built inside the Docker image
+/assets/node_modules/
+/priv/plts/
+/priv/static/assets/
+/priv/static/cache_manifest.json
diff --git a/.gitignore b/.gitignore
index 92ca450..c63085e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 # paths
+/.elixir_ls/
+/.elixir-tools/
 /_build/
 /cover/
 /report/
@@ -13,5 +15,5 @@ erl_crash.dump
 *.ez
 wabanex-*.tar
 docker-compose.*.yml
-priv/docker/pgcli/history
-priv/docker/pgcli/log
+/priv/docker/pgcli/history
+/priv/docker/pgcli/log