Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NXCT-548: install all packages at the same time #46

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

NXCT-548: install all packages at the same time #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 10.10/centos/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ EOF
for f in /docker-entrypoint-initnuxeo.d/*; do
case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;;
*.zip) echo "$0: installing Nuxeo package $f"; nuxeoctl mp-install $f ${NUXEO_MPINSTALL_OPTIONS} --accept=true ;;
*.zip) echo "$0: Adding Nuxeo package to install $f"; NUXEO_PACKAGES="$NUXEO_PACKAGES $f" ;;
*.clid) echo "$0: copying clid to $NUXEO_DATA"; cp $f $NUXEO_DATA/ ;;
# Special case for nuxeo.conf handled above, don't log
*nuxeo.conf) ;;
Expand Down
2 changes: 1 addition & 1 deletion 10.10/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ EOF
for f in /docker-entrypoint-initnuxeo.d/*; do
case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;;
*.zip) echo "$0: installing Nuxeo package $f"; nuxeoctl mp-install $f ${NUXEO_MPINSTALL_OPTIONS} --accept=true ;;
*.zip) echo "$0: Adding Nuxeo package to install $f"; NUXEO_PACKAGES="$NUXEO_PACKAGES $f" ;;
*.clid) echo "$0: copying clid to $NUXEO_DATA"; cp $f $NUXEO_DATA/ ;;
# Special case for nuxeo.conf handled above, don't log
*nuxeo.conf) ;;
Expand Down
2 changes: 1 addition & 1 deletion 10.10/rhel/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ EOF
for f in /docker-entrypoint-initnuxeo.d/*; do
case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;;
*.zip) echo "$0: installing Nuxeo package $f"; nuxeoctl mp-install $f ${NUXEO_MPINSTALL_OPTIONS} --accept=true ;;
*.zip) echo "$0: Adding Nuxeo package to install $f"; NUXEO_PACKAGES="$NUXEO_PACKAGES $f" ;;
*.clid) echo "$0: copying clid to $NUXEO_DATA"; cp $f $NUXEO_DATA/ ;;
# Special case for nuxeo.conf handled above, don't log
*nuxeo.conf) ;;
Expand Down
2 changes: 1 addition & 1 deletion 9.10/centos/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ EOF
for f in /docker-entrypoint-initnuxeo.d/*; do
case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;;
*.zip) echo "$0: installing Nuxeo package $f"; nuxeoctl mp-install $f ${NUXEO_MPINSTALL_OPTIONS} --accept=true ;;
*.zip) echo "$0: Adding Nuxeo package to install $f"; NUXEO_PACKAGES="$NUXEO_PACKAGES $f" ;;
*.clid) echo "$0: copying clid to $NUXEO_DATA"; cp $f $NUXEO_DATA/ ;;
# Special case for nuxeo.conf handled above, don't log
*nuxeo.conf) ;;
Expand Down
2 changes: 1 addition & 1 deletion 9.10/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ EOF
for f in /docker-entrypoint-initnuxeo.d/*; do
case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;;
*.zip) echo "$0: installing Nuxeo package $f"; nuxeoctl mp-install $f ${NUXEO_MPINSTALL_OPTIONS} --accept=true ;;
*.zip) echo "$0: Adding Nuxeo package to install $f"; NUXEO_PACKAGES="$NUXEO_PACKAGES $f" ;;
*.clid) echo "$0: copying clid to $NUXEO_DATA"; cp $f $NUXEO_DATA/ ;;
# Special case for nuxeo.conf handled above, don't log
*nuxeo.conf) ;;
Expand Down
2 changes: 1 addition & 1 deletion 9.10/rhel/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ EOF
for f in /docker-entrypoint-initnuxeo.d/*; do
case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;;
*.zip) echo "$0: installing Nuxeo package $f"; nuxeoctl mp-install $f ${NUXEO_MPINSTALL_OPTIONS} --accept=true ;;
*.zip) echo "$0: Adding Nuxeo package to install $f"; NUXEO_PACKAGES="$NUXEO_PACKAGES $f" ;;
*.clid) echo "$0: copying clid to $NUXEO_DATA"; cp $f $NUXEO_DATA/ ;;
# Special case for nuxeo.conf handled above, don't log
*nuxeo.conf) ;;
Expand Down
2 changes: 1 addition & 1 deletion master/centos/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ EOF
for f in /docker-entrypoint-initnuxeo.d/*; do
case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;;
*.zip) echo "$0: installing Nuxeo package $f"; nuxeoctl mp-install $f ${NUXEO_MPINSTALL_OPTIONS} --accept=true ;;
*.zip) echo "$0: Adding Nuxeo package to install $f"; NUXEO_PACKAGES="$NUXEO_PACKAGES $f" ;;
*.clid) echo "$0: copying clid to $NUXEO_DATA"; cp $f $NUXEO_DATA/ ;;
# Special case for nuxeo.conf handled above, don't log
*nuxeo.conf) ;;
Expand Down
2 changes: 1 addition & 1 deletion master/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ EOF
for f in /docker-entrypoint-initnuxeo.d/*; do
case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;;
*.zip) echo "$0: installing Nuxeo package $f"; nuxeoctl mp-install $f ${NUXEO_MPINSTALL_OPTIONS} --accept=true ;;
*.zip) echo "$0: Adding Nuxeo package to install $f"; NUXEO_PACKAGES="$NUXEO_PACKAGES $f" ;;
*.clid) echo "$0: copying clid to $NUXEO_DATA"; cp $f $NUXEO_DATA/ ;;
# Special case for nuxeo.conf handled above, don't log
*nuxeo.conf) ;;
Expand Down
2 changes: 1 addition & 1 deletion master/rhel/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ EOF
for f in /docker-entrypoint-initnuxeo.d/*; do
case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;;
*.zip) echo "$0: installing Nuxeo package $f"; nuxeoctl mp-install $f ${NUXEO_MPINSTALL_OPTIONS} --accept=true ;;
*.zip) echo "$0: Adding Nuxeo package to install $f"; NUXEO_PACKAGES="$NUXEO_PACKAGES $f" ;;
*.clid) echo "$0: copying clid to $NUXEO_DATA"; cp $f $NUXEO_DATA/ ;;
# Special case for nuxeo.conf handled above, don't log
*nuxeo.conf) ;;
Expand Down
10 changes: 5 additions & 5 deletions staging/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash
set -e


Expand All @@ -23,22 +23,22 @@ EOF
if [ -n "$NUXEO_CUSTOM_PARAM" ]; then
printf "%b\n" "$NUXEO_CUSTOM_PARAM" >> $NUXEO_CONF
fi

# Deprecated since 9.1, put a nuxeo.conf file in /docker-entrypoint-initnuxeo.d instead
if [ -f /nuxeo.conf ]; then
cat /nuxeo.conf >> $NUXEO_CONF
fi
fi

if [ -f /docker-entrypoint-initnuxeo.d/nuxeo.conf ]; then
cat /docker-entrypoint-initnuxeo.d/nuxeo.conf >> $NUXEO_CONF
fi
fi
touch $NUXEO_HOME/configured
fi

for f in /docker-entrypoint-initnuxeo.d/*; do
case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;;
*.zip) echo "$0: installing Nuxeo package $f"; nuxeoctl mp-install $f ${NUXEO_MPINSTALL_OPTIONS} --accept=true ;;
*.zip) echo "$0: Adding Nuxeo package to install $f"; NUXEO_PACKAGES="$NUXEO_PACKAGES $f" ;;
*.clid) echo "$0: copying clid to $NUXEO_DATA"; cp $f $NUXEO_DATA/ ;;
# Special case for nuxeo.conf handled above, don't log
*nuxeo.conf) ;;
Expand Down
2 changes: 1 addition & 1 deletion templates/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ EOF
for f in /docker-entrypoint-initnuxeo.d/*; do
case "$f" in
*.sh) echo "$0: running $f"; . "$f" ;;
*.zip) echo "$0: installing Nuxeo package $f"; nuxeoctl mp-install $f ${NUXEO_MPINSTALL_OPTIONS} --accept=true ;;
*.zip) echo "$0: Adding Nuxeo package to install $f"; NUXEO_PACKAGES="$NUXEO_PACKAGES $f" ;;
*.clid) echo "$0: copying clid to $NUXEO_DATA"; cp $f $NUXEO_DATA/ ;;
# Special case for nuxeo.conf handled above, don't log
*nuxeo.conf) ;;
Expand Down