diff --git a/src/.s2i/bin/assemble-swoole b/docker/swoole/rootfs/usr/local/bin/assemble-swoole similarity index 100% rename from src/.s2i/bin/assemble-swoole rename to docker/swoole/rootfs/usr/local/bin/assemble-swoole diff --git a/src/.s2i/bin/assemble b/src/.s2i/bin/assemble index db432a48..5f2683b2 100755 --- a/src/.s2i/bin/assemble +++ b/src/.s2i/bin/assemble @@ -1,41 +1,35 @@ #!/bin/bash set -e shopt -s dotglob echo "--->> $(rm -vrf vendor/ composer.lock)" if [ -f ".env.local" ]; then # Ensure there's a line ending echo "---->> Append .env.local" echo "" >> .env cat .env.local >> .env fi env echo "--->> Run stock assemble script ${ASSEMBLE_SCRIPT:=/usr/libexec/s2i/assemble}" if [[ -f "${ASSEMBLE_SCRIPT}" || -f "/tmp/scripts/${ASSEMBLE_SCRIPT}" ]]; then ${ASSEMBLE_SCRIPT} else echo "--->> ${ASSEMBLE_SCRIPT} does not exist" fi -ls -l /tmp/scripts/ - -#cat >> /opt/app-root/etc/conf.d/99-loglevel.conf << EOF -#LogLevel warn mod_rewrite.c:trace4 -#EOF - # Won't work due to: # Cannot install, php_dir for channel "pecl.php.net" is not writeable by the current user #pecl channel-update pecl.php.net #pecl install swoole pushd /opt/app-root/src echo "---->> Run npm run prod" npm install cross-env npm run prod