diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..bd259f3
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+* text=auto
+
+*.sh text eol=lf
+run text eol=lf
diff --git a/couchbase-2.5/Dockerfile b/couchbase-2.5/Dockerfile
index d65148a..c0da9c8 100644
--- a/couchbase-2.5/Dockerfile
+++ b/couchbase-2.5/Dockerfile
@@ -19,10 +19,10 @@ RUN sed -i 's|http://archive.ubuntu.com/ubuntu/|http://old-releases.ubuntu.com/u
 #  numactl: numactl
 RUN apt-get update && \
     apt-get install -yq runit wget python-httplib2 chrpath tzdata \
-    lsof lshw sysstat net-tools numactl librtmp0 \
-    libssl0.9.8 \
-    dos2unix \
-    && \
+    lsof lshw sysstat net-tools numactl librtmp0 && \
+    # apt-get install -yq libssl0.9.8 && \
+    # apt-get install -yq dos2unix && \
+    apt-get install -yq libc6 && \
     apt-get autoremove && apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
@@ -45,15 +45,15 @@ RUN export INSTALL_DONT_START_SERVER=1 && \
 
 # Add runit script for couchbase-server
 COPY scripts/run /etc/service/couchbase-server/run
-RUN dos2unix /etc/service/couchbase-server/run && \
-    chmod +x /etc/service/couchbase-server/run
+# RUN dos2unix /etc/service/couchbase-server/run && \
+#     chmod +x /etc/service/couchbase-server/run
 RUN chown -R couchbase:couchbase /etc/service
 
 # Add dummy script for commands invoked by cbcollect_info that
 # make no sense in a Docker container
 COPY scripts/dummy.sh /usr/local/bin/
-RUN dos2unix /usr/local/bin/dummy.sh && \
-    chmod +x /usr/local/bin/dummy.sh
+# RUN dos2unix /usr/local/bin/dummy.sh && \
+#     chmod +x /usr/local/bin/dummy.sh
 RUN ln -s dummy.sh /usr/local/bin/iptables-save && \
     ln -s dummy.sh /usr/local/bin/lvdisplay && \
     ln -s dummy.sh /usr/local/bin/vgdisplay && \
@@ -64,11 +64,10 @@ RUN chrpath -r '$ORIGIN/../lib' /opt/couchbase/bin/curl
 
 # Add bootstrap script
 COPY scripts/entrypoint.sh /
-RUN dos2unix /entrypoint.sh && \
-    chmod +x /entrypoint.sh
+# RUN dos2unix /entrypoint.sh && \
+#     chmod +x /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["couchbase-server"]
-# CMD ["runsvdir", "-P", "/etc/service"]
+CMD ["couchbase-server", "-- -kernel global_enable_tracing false -noinput"]
 
 # 8091: Couchbase Web console, REST/HTTP interface
 # 8092: Views, queries, XDCR
diff --git a/couchbase-2.5/docker-compose.example.yml b/couchbase-2.5/docker-compose.example.yml
index 5e443b0..c99227d 100644
--- a/couchbase-2.5/docker-compose.example.yml
+++ b/couchbase-2.5/docker-compose.example.yml
@@ -1,7 +1,7 @@
 services:
   couchbase:
-    image: ghcr.io/tiennm99/docker-images/couchbase-2.5:latest
-    # image: couchbase-2.5:latest
+    # image: ghcr.io/tiennm99/docker-images/couchbase-2.5:latest
+    image: couchbase-2.5:latest
     ports:
       - "8091:8091"
       - "8092:8092"
@@ -9,8 +9,8 @@ services:
       - "11211:11211"
     # stdin_open: true
     # tty: true
-    volumes:
-      - couchbase_data:/opt/couchbase/var
+#     volumes:
+#       - couchbase_data:/opt/couchbase/var
 
-volumes:
-  couchbase_data:
+# volumes:
+#   couchbase_data: