Tweaks to make it actually run!

389ds · Feb 20, 2024 · 6d64a56 · 6d64a56
1 parent 2f76ada
commit 6d64a56
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.devcontainer/Containerfile b/.devcontainer/Containerfile
@@ -1,8 +1,8 @@
 FROM quay.io/389ds/devcontainer
 
-COPY ./.devcontainer/container-entrypoint.sh /container-entrypoint.sh
+COPY ./container-entrypoint.sh /container-entrypoint.sh
 
-RUN dnf install tini
+RUN dnf install -y tini
 
 # DEFAULTS
 ENV CC=gcc \
@@ -13,5 +13,5 @@ ENV CC=gcc \
     DS_DM_PASSWORD=password \
     DS_SUFFIX_NAME=dc=example,dc=com
 
-ENTRYPOINT ["/sbin/tini", "--", "/container-entrypoint.sh"]
+ENTRYPOINT ["/usr/bin/tini", "--", "/container-entrypoint.sh"]
 
diff --git a/.devcontainer/compose.yaml b/.devcontainer/compose.yaml
@@ -14,4 +14,4 @@ services:
       - path: ./overrides.env
         required: false
     volumes:
-      - ./:/389-ds-base
+      - ../:/389-ds-base
diff --git a/.devcontainer/container-entrypoint.sh b/.devcontainer/container-entrypoint.sh
@@ -15,9 +15,11 @@ if [ ! -f /cert-check-complete ]; then
   fi
   touch /cert-check-complete
 else
-  echo -e "Cert check already complete; skipping"
+  echo "Cert check already complete; skipping"
 fi
 
+echo "Container ready!"
+
 ##
 # Note: PID 1 should actually be tini or similar.  If users decide to override the entrypoint
 # it is recommended to continue to use tini or similar.