Skip to content

Fixing issues #97

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 1 commit into from
Jan 3, 2020
Merged

Fixing issues #97

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
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 @@ -24,7 +24,6 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \
mysql-client \
bash \
$PHPIZE_DEPS \
libpng-dev \
libjpeg62-turbo-dev \
libtool \
Expand Down
4 changes: 2 additions & 2 deletions 2019.12/apache/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ setup_ssmtp() {
smtp_from=${SMTP_FROM:-no-reply}

# Setup SSMTP
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data

# add possible mail-senders
{
Expand Down
3 changes: 2 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 @@ -7,7 +7,8 @@ RUN set -ex; \
rsync \
git \
# For mail() support
ssmtp;
ssmtp \
shadow;

# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
Expand Down
4 changes: 2 additions & 2 deletions 2019.12/fpm-alpine/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ setup_ssmtp() {
smtp_from=${SMTP_FROM:-no-reply}

# Setup SSMTP
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data

# add possible mail-senders
{
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 @@ -24,7 +24,6 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \
mysql-client \
bash \
$PHPIZE_DEPS \
libpng-dev \
libjpeg62-turbo-dev \
libtool \
Expand Down
4 changes: 2 additions & 2 deletions 2019.12/fpm/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ setup_ssmtp() {
smtp_from=${SMTP_FROM:-no-reply}

# Setup SSMTP
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data

# add possible mail-senders
{
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 @@ -24,7 +24,6 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \
mysql-client \
bash \
$PHPIZE_DEPS \
libpng-dev \
libjpeg62-turbo-dev \
libtool \
Expand Down
2 changes: 1 addition & 1 deletion 2020.03-dev/apache/entrypoint-dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
fi
fi

/entrypoint.sh "$@"
exec /entrypoint.sh "$@"
4 changes: 2 additions & 2 deletions 2020.03-dev/apache/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ setup_ssmtp() {
smtp_from=${SMTP_FROM:-no-reply}

# Setup SSMTP
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data

# add possible mail-senders
{
Expand Down
3 changes: 2 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 @@ -7,7 +7,8 @@ RUN set -ex; \
rsync \
git \
# For mail() support
ssmtp;
ssmtp \
shadow;

# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
Expand Down
2 changes: 1 addition & 1 deletion 2020.03-dev/fpm-alpine/entrypoint-dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
fi
fi

/entrypoint.sh "$@"
exec /entrypoint.sh "$@"
4 changes: 2 additions & 2 deletions 2020.03-dev/fpm-alpine/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ setup_ssmtp() {
smtp_from=${SMTP_FROM:-no-reply}

# Setup SSMTP
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data

# add possible mail-senders
{
Expand Down
1 change: 0 additions & 1 deletion 2020.03-dev/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \
mysql-client \
bash \
$PHPIZE_DEPS \
libpng-dev \
libjpeg62-turbo-dev \
libtool \
Expand Down
2 changes: 1 addition & 1 deletion 2020.03-dev/fpm/entrypoint-dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
fi
fi

/entrypoint.sh "$@"
exec /entrypoint.sh "$@"
4 changes: 2 additions & 2 deletions 2020.03-dev/fpm/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ setup_ssmtp() {
smtp_from=${SMTP_FROM:-no-reply}

# Setup SSMTP
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data

# add possible mail-senders
{
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ RUN set -ex; \
rsync \
git \
# For mail() support
ssmtp;
ssmtp \
shadow;

# install the PHP extensions we need
# see https://friendi.ca/resources/requirements/
Expand Down
1 change: 0 additions & 1 deletion Dockerfile-debian.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \
mysql-client \
bash \
$PHPIZE_DEPS \
libpng-dev \
libjpeg62-turbo-dev \
libtool \
Expand Down
2 changes: 1 addition & 1 deletion docker-entrypoint-dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
fi
fi

/entrypoint.sh "$@"
exec /entrypoint.sh "$@"
4 changes: 2 additions & 2 deletions docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ setup_ssmtp() {
smtp_from=${SMTP_FROM:-no-reply}

# Setup SSMTP
sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data

# add possible mail-senders
{
Expand Down