diff --git a/.devcontainer/Containerfile b/.devcontainer/Containerfile index 13c5c272c5..0734c83f51 100644 --- 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 index 4c507e7336..036abe1614 100644 --- a/.devcontainer/compose.yaml +++ b/.devcontainer/compose.yaml @@ -14,4 +14,4 @@ services: - path: ./overrides.env required: false volumes: - - ./:/389-ds-base \ No newline at end of file + - ../:/389-ds-base \ No newline at end of file diff --git a/.devcontainer/container-entrypoint.sh b/.devcontainer/container-entrypoint.sh index bb3539327e..92d17313cf 100644 --- 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.