cascade/ipfs-cluster
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #216: Docker does not like an env variable in CMD (anymore?)

Browse Source 
This used to work. Even if it's been surfaced by 4a8759939 we were
extensively testing the Dockerfile before that release.

License: MIT
Signed-off-by: Hector Sanjuan <hector@protocol.ai>
This commit is contained in:
Hector Sanjuan 2017-10-31 11:46:32 +01:00
parent e51f771391
commit fb7be4137f
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -35,4 +35,5 @@ RUN mkdir -p $IPFS_CLUSTER_PATH && \
VOLUME $IPFS_CLUSTER_PATH
ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/start-daemons.sh"]
CMD ["$IPFS_CLUSTER_OPTS"]
# Defaults for ipfs-cluster-service would go here
CMD []

3
Dockerfile-test
View File

@ -53,4 +53,5 @@ RUN mkdir -p $IPFS_CLUSTER_PATH && \
VOLUME $IPFS_CLUSTER_PATH
ENTRYPOINT ["/usr/local/bin/start-daemons.sh"]
CMD ["$IPFS_CLUSTER_OPTS"]
# Defaults would go here
CMD []

5
docker/entrypoint.sh
View File

@ -1,6 +1,9 @@
#!/bin/sh
set -e
if [ -n "$DOCKER_DEBUG" ]; then
set -x
fi
user=ipfs
if [ `id -u` -eq 0 ]; then
@ -8,7 +11,7 @@ if [ `id -u` -eq 0 ]; then
# ensure directories are writable
su-exec "$user" test -w "${IPFS_PATH}" || chown -R -- "$user" "${IPFS_PATH}"
su-exec "$user" test -w "${IPFS_CLUSTER_PATH}" || chown -R -- "$user" "${IPFS_CLUSTER_PATH}"
exec su-exec "$user" "$0" "$@"
exec su-exec "$user" "$0" $@
fi
# Second invocation with regular user

5
docker/test-entrypoint.sh
View File

@ -1,6 +1,9 @@
#!/bin/sh
set -e
if [ -n "$DOCKER_DEBUG" ]; then
set -x
fi
user=ipfs
if [ `id -u` -eq 0 ]; then
@ -8,7 +11,7 @@ if [ `id -u` -eq 0 ]; then
# ensure directories are writable
su-exec "$user" test -w "${IPFS_PATH}" || chown -R -- "$user" "${IPFS_PATH}"
su-exec "$user" test -w "${IPFS_CLUSTER_PATH}" || chown -R -- "$user" "${IPFS_CLUSTER_PATH}"
exec su-exec "$user" "$0" "$@"
exec su-exec "$user" "$0" $@
fi
ipfs version