1
0
Fork 0
mirror of https://git.tt-rss.org/fox/ttrss-docker-compose synced 2025-06-14 09:39:53 +02:00

initial for mariadb

This commit is contained in:
Andrew Dolgov 2021-02-27 15:13:57 +03:00
parent f11f02a3ad
commit 0921c53b72
5 changed files with 25 additions and 117 deletions

View file

@ -2,11 +2,11 @@ FROM alpine:3.13
EXPOSE 9000/tcp
RUN apk add --no-cache dcron php8 php8-fpm \
php8-pdo php8-gd php8-pgsql php8-pdo_pgsql php8-mbstring \
php8-pdo php8-gd php8-mysqlnd php8-pdo_mysql php8-mbstring \
php8-intl php8-xml php8-curl php8-session \
php8-dom php8-fileinfo php8-json php8-iconv \
php8-pcntl php8-posix php8-zip php8-openssl \
git postgresql-client sudo php8-pecl-xdebug
git mysql-client sudo php8-pecl-xdebug
ENV SCRIPT_ROOT=/opt/tt-rss
@ -31,9 +31,9 @@ ENV TTRSS_XDEBUG_ENABLED=""
ENV TTRSS_XDEBUG_HOST=""
ENV TTRSS_XDEBUG_PORT="9000"
ENV TTRSS_DB_TYPE="pgsql"
ENV TTRSS_DB_TYPE="mysql"
ENV TTRSS_DB_HOST="db"
ENV TTRSS_DB_PORT="5432"
ENV TTRSS_DB_PORT="3306"
ENV TTRSS_MYSQL_CHARSET="UTF8"
ENV TTRSS_PHP_EXECUTABLE="/usr/bin/php8"

View file

@ -1,6 +1,6 @@
#!/bin/sh -e
while ! pg_isready -h $TTRSS_DB_HOST -U $TTRSS_DB_USER; do
while ! mysql -h $TTRSS_DB_HOST -u $TTRSS_DB_USER -p$TTRSS_DB_PASS -e "select 1"; do
echo waiting until $TTRSS_DB_HOST is ready...
sleep 3
done
@ -19,11 +19,9 @@ SRC_REPO=https://git.tt-rss.org/fox/tt-rss.git
[ -e $DST_DIR ] && rm -f $DST_DIR/.app_is_ready
export PGPASSWORD=$TTRSS_DB_PASS
[ ! -e /var/www/html/index.php ] && cp ${SCRIPT_ROOT}/index.php /var/www/html
PSQL="psql -q -h $TTRSS_DB_HOST -U $TTRSS_DB_USER $TTRSS_DB_NAME"
PSQL="mysql -q -h $TTRSS_DB_HOST -u $TTRSS_DB_USER -p$TTRSS_DB_PASS $TTRSS_DB_NAME"
if [ ! -d $DST_DIR/.git ]; then
mkdir -p $DST_DIR
@ -65,14 +63,12 @@ for d in cache lock feed-icons; do
find $DST_DIR/$d -type f -exec chmod 666 {} \;
done
$PSQL -c "create extension if not exists pg_trgm"
RESTORE_SCHEMA=${SCRIPT_ROOT}/restore-schema.sql.gz
if [ -r $RESTORE_SCHEMA ]; then
zcat $RESTORE_SCHEMA | $PSQL
elif ! $PSQL -c 'select * from ttrss_version'; then
$PSQL < /var/www/html/tt-rss/schema/ttrss_schema_pgsql.sql
elif ! $PSQL -e 'select * from ttrss_version'; then
$PSQL < /var/www/html/tt-rss/schema/ttrss_schema_mysql.sql
fi
# this was previously generated

View file

@ -12,7 +12,7 @@ if ! id app >/dev/null 2>&1; then
adduser -D -h /var/www/html -G app -u $OWNER_UID app
fi
while ! pg_isready -h $TTRSS_DB_HOST -U $TTRSS_DB_USER; do
while ! mysql -h $TTRSS_DB_HOST -u $TTRSS_DB_USER -p$TTRSS_DB_PASS -e "select 1"; do
echo waiting until $TTRSS_DB_HOST is ready...
sleep 3
done