Skip to content

Fix $MYSQL_PORT default fallback & Removes the packed binary #96

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

Merged
MrPetovan merged 3 commits into from
Jan 2, 2020
Merged

Fix $MYSQL_PORT default fallback & Removes the packed binary #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0448d4
Fix $MYSQL_PORT default fallback & Removes the packed binary in favou…
nupplaphil Jan 2, 2020
11e884d
run ./update.sh
nupplaphil Jan 2, 2020
e806316
Fixed Dockerfiles
nupplaphil Jan 2, 2020
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
47 changes: 0 additions & 47 deletions .bin/wait-for-connection
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion 2019.12/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ RUN set -ex; \

COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/
COPY bin/* /usr/local/bin/

ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"]
47 changes: 0 additions & 47 deletions 2019.12/apache/bin/wait-for-connection
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion 2019.12/apache/cron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
done

echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
exec php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
Expand Down
2 changes: 1 addition & 1 deletion 2019.12/apache/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then

if [ "$install" = true ]; then
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then

echo "Starting Friendica installation ..."
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
Expand Down
1 change: 0 additions & 1 deletion 2019.12/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ RUN set -ex; \

COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/
COPY bin/* /usr/local/bin/

ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"]
47 changes: 0 additions & 47 deletions 2019.12/fpm-alpine/bin/wait-for-connection
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion 2019.12/fpm-alpine/cron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
done

echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
exec php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
Expand Down
2 changes: 1 addition & 1 deletion 2019.12/fpm-alpine/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then

if [ "$install" = true ]; then
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then

echo "Starting Friendica installation ..."
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
Expand Down
1 change: 0 additions & 1 deletion 2019.12/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ RUN set -ex; \

COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/
COPY bin/* /usr/local/bin/

ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"]
47 changes: 0 additions & 47 deletions 2019.12/fpm/bin/wait-for-connection
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion 2019.12/fpm/cron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
done

echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
exec php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
Expand Down
2 changes: 1 addition & 1 deletion 2019.12/fpm/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then

if [ "$install" = true ]; then
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then

echo "Starting Friendica installation ..."
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
Expand Down
1 change: 0 additions & 1 deletion 2020.03-dev/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ ENV FRIENDICA_ADDONS 2020.03-dev

COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/
COPY bin/* /usr/local/bin/

ENTRYPOINT ["/entrypoint-dev.sh"]
CMD ["apache2-foreground"]
47 changes: 0 additions & 47 deletions 2020.03-dev/apache/bin/wait-for-connection
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion 2020.03-dev/apache/cron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
done

echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
exec php /var/www/html/bin/daemon.php -f start
else
echo "[ERROR] Waited 300 seconds, no response" >&2
Expand Down
2 changes: 1 addition & 1 deletion 2020.03-dev/apache/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then

if [ "$install" = true ]; then
echo "Waiting for MySQL $MYSQL_HOST initialization..."
if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then

echo "Starting Friendica installation ..."
run_as "php /var/www/html/bin/console.php autoinstall $install_options"
Expand Down
1 change: 0 additions & 1 deletion 2020.03-dev/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ ENV FRIENDICA_ADDONS 2020.03-dev

COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/
COPY bin/* /usr/local/bin/

ENTRYPOINT ["/entrypoint-dev.sh"]
CMD ["php-fpm"]
47 changes: 0 additions & 47 deletions 2020.03-dev/fpm-alpine/bin/wait-for-connection
View file
Open in desktop

This file was deleted.

Loading