diff --git a/Dockerfile b/Dockerfile
index 0d13c1b..2e7da41 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,5 +8,6 @@ USER devpisrv:devpisrv
 RUN pip3 install -U pip
 ENV PATH="/home/devpisrv/.local/bin:${PATH}"
 RUN pip install -U -r /tmp/requirements.txt
-RUN devpi-init --serverdir /var/local/devpisrv
-CMD devpi-server --serverdir /var/local/devpisrv --host 0.0.0.0
+COPY src/devpisrv.sh /usr/local/bin/
+ENTRYPOINT ["devpisrv.sh"]
+
diff --git a/src/devpisrv.sh b/src/devpisrv.sh
new file mode 100755
index 0000000..39e951d
--- /dev/null
+++ b/src/devpisrv.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+SERVER_DIR=/var/local/devpisrv
+
+if [[ ! -f "$SERVER_DIR/.nodeinfo" ]]
+then
+    devpi-init --serverdir "$SERVER_DIR"
+fi
+
+devpi-server --serverdir "$SERVER_DIR" --host 0.0.0.0
+