- [docker](src/docker/bin/docker-entrypoint.sh) Now use entry.d and exit.d.

Author: mlan

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.0.2
+
+- [docker](src/docker/bin/docker-entrypoint.sh) Now use entry.d and exit.d.
 
 # 1.0.1
 

Dockerfile

@@ -13,7 +13,7 @@ ARG	REL=alpine
 FROM	$DIST:$REL AS base
 LABEL	maintainer=mlan
 
-ENV	DOCKER_ENTRY_DIR=/etc/entrypoint.d \
+ENV	DOCKER_ENTRY_DIR=/etc/docker/entry.d \
 	DOCKER_BIN_DIR=/usr/local/bin \
 	DOCKER_CONF_DIR=/etc/nginx/conf.d \
 	DOCKER_ENVSUBST_DIR=usr/share/misc \
@@ -26,7 +26,7 @@ ENV	DOCKER_ENTRY_DIR=/etc/entrypoint.d \
 #
 
 COPY	src/*/bin $DOCKER_BIN_DIR/
-COPY	src/*/entrypoint.d $DOCKER_ENTRY_DIR/
+COPY	src/*/entry.d $DOCKER_ENTRY_DIR/
 COPY	src/*/config $DOCKER_CONF_DIR/
 COPY	src/*/envsubst $DOCKER_ENVSUBST_DIR/
 
@@ -60,7 +60,7 @@ HEALTHCHECK CMD nginx -t &>/dev/null && wget -O - localhost:80 &>/dev/null \
 # Entrypoint, how container is run
 #
 
-ENTRYPOINT	["entrypoint.sh"]
+ENTRYPOINT	["docker-entrypoint.sh"]
 
 CMD	["nginx", "-g", "daemon off;"]
 

README.md

@@ -125,7 +125,7 @@ Here some implementation details are presented.
 
 ## Container init scheme
 
-When the container is started, execution is handed over to the script [`entrypoint.sh`](src/docker/bin/entrypoint.sh). It has 2 stages; 1) *run* all entry scripts in `/etc/entrypoint.d/`, 2) *execute* command in `CMD ["nginx", "-g", "daemon off;"]`.
+When the container is started, execution is handed over to the script [`docker-entrypoint.sh`](src/docker/bin/docker-entrypoint.sh). It has 2 stages; 1) *run* all entry scripts in `/etc/docker/entry.d/`, 2) *execute* command in `CMD ["nginx", "-g", "daemon off;"]`.
 
 The entry scripts are responsible for tasks like, generate configurations, and spawning processes.
 
@@ -135,7 +135,7 @@ The entry scripts, discussed above, as well as other utility scrips are copied t
 
 ```dockerfile
 COPY	src/*/bin $DOCKER_BIN_DIR/
-COPY	src/*/entrypoint.d $DOCKER_ENTRY_DIR/
+COPY	src/*/entry.d $DOCKER_ENTRY_DIR/
 COPY	src/*/config $DOCKER_CONF_DIR/
 COPY	src/*/envsubst $DOCKER_ENVSUBST_DIR/
 ```

src/docker/bin/entrypoint.sh src/docker/bin/docker-entrypoint.shsrc/docker/bin/entrypoint.sh renamed to src/docker/bin/docker-entrypoint.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-DOCKER_ENTRY_DIR=${DOCKER_ENTRY_DIR-/etc/entrypoint.d}
+DOCKER_ENTRY_DIR=${DOCKER_ENTRY_DIR-/etc/docker/entry.d}
 
 # redirect stderr
 exec 2>&1