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

Install missing skin via composer on system initialization #254

Merged
merged 9 commits into from
Dec 9, 2024
Merged

Install missing skin via composer on system initialization #254

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
14c252f
Install missing skin via composer. Otherwise you will get an error (a…
Jun 7, 2024
8c5b1eb
Added echo to be consitent with other sections
bjalbor Nov 29, 2024
03f351b
Added installation of non-default skin to test
bjalbor Nov 29, 2024
22c9bb8
Install missing skin via composer. Otherwise you will get an error (a…
Jun 7, 2024
4415409
Added echo to be consitent with other sections
bjalbor Nov 29, 2024
273c654
Added installation of non-default skin to test
bjalbor Nov 29, 2024
8c160ab
Merge branch 'fix-skin' of https://github.com/bjalbor/roundcubemail-d…
Dec 6, 2024
8124077
Rebase Pull Request to master
Dec 6, 2024
65d45d2
Merge branch 'master' into fix-skin
pabzm Dec 9, 2024
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
15 changes: 15 additions & 0 deletions apache/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,21 @@ if [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
${ROUNDCUBEMAIL_PLUGINS_SH};
fi

if [ ! -d skins/${ROUNDCUBEMAIL_SKIN} ]; then
# Installing missing skin
echo "Installing missing skin: ${ROUNDCUBEMAIL_SKIN}"
composer \
--working-dir=/usr/src/roundcubemail/ \
pabzm marked this conversation as resolved.
Show resolved Hide resolved
--prefer-dist \
--prefer-stable \
--update-no-dev \
--no-interaction \
--optimize-autoloader \
require \
-- \
roundcube/${ROUNDCUBEMAIL_SKIN};
fi

if [ ! -e config/config.inc.php ]; then
GENERATED_DES_KEY=`head /dev/urandom | base64 | head -c 24`
touch config/config.inc.php
Expand Down
15 changes: 15 additions & 0 deletions fpm-alpine/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,21 @@ if [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
${ROUNDCUBEMAIL_PLUGINS_SH};
fi

if [ ! -d skins/${ROUNDCUBEMAIL_SKIN} ]; then
# Installing missing skin
echo "Installing missing skin: ${ROUNDCUBEMAIL_SKIN}"
composer \
--working-dir=/usr/src/roundcubemail/ \
--prefer-dist \
--prefer-stable \
--update-no-dev \
--no-interaction \
--optimize-autoloader \
require \
-- \
roundcube/${ROUNDCUBEMAIL_SKIN};
fi

if [ ! -e config/config.inc.php ]; then
GENERATED_DES_KEY=`head /dev/urandom | base64 | head -c 24`
touch config/config.inc.php
Expand Down
15 changes: 15 additions & 0 deletions fpm/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,21 @@ if [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
${ROUNDCUBEMAIL_PLUGINS_SH};
fi

if [ ! -d skins/${ROUNDCUBEMAIL_SKIN} ]; then
# Installing missing skin
echo "Installing missing skin: ${ROUNDCUBEMAIL_SKIN}"
composer \
--working-dir=/usr/src/roundcubemail/ \
--prefer-dist \
--prefer-stable \
--update-no-dev \
--no-interaction \
--optimize-autoloader \
require \
-- \
roundcube/${ROUNDCUBEMAIL_SKIN};
fi

if [ ! -e config/config.inc.php ]; then
GENERATED_DES_KEY=`head /dev/urandom | base64 | head -c 24`
touch config/config.inc.php
Expand Down
15 changes: 15 additions & 0 deletions templates/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,21 @@ if [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
${ROUNDCUBEMAIL_PLUGINS_SH};
fi

if [ ! -d skins/${ROUNDCUBEMAIL_SKIN} ]; then
pabzm marked this conversation as resolved.
Show resolved Hide resolved
# Installing missing skin
echo "Installing missing skin: ${ROUNDCUBEMAIL_SKIN}"
composer \
--working-dir=/usr/src/roundcubemail/ \
--prefer-dist \
--prefer-stable \
--update-no-dev \
--no-interaction \
--optimize-autoloader \
require \
-- \
roundcube/${ROUNDCUBEMAIL_SKIN};
fi

if [ ! -e config/config.inc.php ]; then
GENERATED_DES_KEY=`head /dev/urandom | base64 | head -c 24`
touch config/config.inc.php
Expand Down
1 change: 1 addition & 0 deletions tests/docker-compose.test-apache-postgres.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ services:
- ROUNDCUBEMAIL_DB_NAME=roundcube # same as pgsql POSTGRES_DB env name
- ROUNDCUBEMAIL_DB_USER=roundcube # same as pgsql POSTGRES_USER env name
- ROUNDCUBEMAIL_DB_PASSWORD=roundcube # same as pgsql POSTGRES_PASSWORD env name
- ROUNDCUBEMAIL_SKIN=larry # Install non-default skin

roundcubedb:
image: postgres:alpine
Expand Down
1 change: 1 addition & 0 deletions tests/docker-compose.test-fpm-postgres.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ services:
- ROUNDCUBEMAIL_DB_NAME=roundcube # same as pgsql POSTGRES_DB env name
- ROUNDCUBEMAIL_DB_USER=roundcube # same as pgsql POSTGRES_USER env name
- ROUNDCUBEMAIL_DB_PASSWORD=roundcube # same as pgsql POSTGRES_PASSWORD env name
- ROUNDCUBEMAIL_SKIN=larry # Install non-default skin

roundcubedb:
image: postgres:alpine
Expand Down
Loading