Skip to content

Commit d5460b8

Browse files
uniuuuuniuuu
committed
path: Update service's base images
1 parent 7ca1f18 commit d5460b8

19 files changed

Lines changed: 82 additions & 83 deletions

File tree

‎.env_example‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ AUTH_SALT=
2727
#Initial Admin User
2828
ADMIN_USERNAME=admin
2929
ADMIN_PASSWORD=admin
30-
ADMIN_EMAIL=admin@zotero.org
30+
ADMIN_EMAIL=admin@example.tld
3131

3232
#Version
33-
VER=v2.9.2
33+
VER=v3.0.0
3434

3535

3636

‎stack/dataserver/config/create-user.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if [ -z "$MYSQLROOTPASSWORD" ]; then
44
echo "ERROR: MYSQLROOTPASSWORD not set" >&2
55
exit 1
66
fi
7-
MYSQL="mysql -h mysql -P 3306 -u root -p${MYSQLROOTPASSWORD}"
7+
MYSQL="mariadb -h mysql -P 3306 -u root -p${MYSQLROOTPASSWORD}"
88
# ${1} username
99
# ${2} email
1010
# ${3} password

‎stack/dataserver/config/disable-user.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if [ -z "$MYSQLROOTPASSWORD" ]; then
44
echo "ERROR: MYSQLROOTPASSWORD not set" >&2
55
exit 1
66
fi
7-
MYSQL="mysql -h mysql -P 3306 -u root -p${MYSQLROOTPASSWORD}"
7+
MYSQL="mariadb -h mysql -P 3306 -u root -p${MYSQLROOTPASSWORD}"
88
# ${1} username
99

1010
userID=$(echo "SELECT userID FROM users WHERE username='${1}';" | $MYSQL zotero_www -s -N)

‎stack/dataserver/config/enable-user.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if [ -z "$MYSQLROOTPASSWORD" ]; then
44
echo "ERROR: MYSQLROOTPASSWORD not set" >&2
55
exit 1
66
fi
7-
MYSQL="mysql -h mysql -P 3306 -u root -p${MYSQLROOTPASSWORD}"
7+
MYSQL="mariadb -h mysql -P 3306 -u root -p${MYSQLROOTPASSWORD}"
88
# ${1} username
99

1010
userID=$(echo "SELECT userID FROM users WHERE username='${1}';" | $MYSQL zotero_www -s -N)

‎stack/dataserver/config/list-users.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ if [ -z "$MYSQLROOTPASSWORD" ]; then
44
echo "ERROR: MYSQLROOTPASSWORD not set" >&2
55
exit 1
66
fi
7-
MYSQL="mysql -h mysql -P 3306 -u root -p${MYSQLROOTPASSWORD}"
7+
MYSQL="mariadb -h mysql -P 3306 -u root -p${MYSQLROOTPASSWORD}"
88

99
echo "SELECT users.userID, username, email, CASE WHEN role='deleted' THEN 'disabled' ELSE 'enabled' END as status FROM users JOIN users_email ON users.userID = users_email.userID;" | $MYSQL zotero_www

‎stack/dataserver/dbconfig/db_update.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -uex
33

4-
MYSQL="mysql -h mysql -P 3306 -u root -pzotero"
4+
MYSQL="mariadb -h mysql -P 3306 -u root -pzotero"
55
echo "ALTER TABLE libraries ADD hasData TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER version , ADD INDEX ( hasData )" | $MYSQL zotero_master
66
echo "UPDATE libraries SET hasData=1 WHERE version > 0 OR lastUpdated != '0000-00-00 00:00:00'" | $MYSQL zotero_master
77
echo "ALTER TABLE libraries DROP COLUMN lastUpdated, DROP COLUMN version" | $MYSQL zotero_master

‎stack/dataserver/dbconfig/db_update2.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ for i in db-updates/*/; do
55
cd /var/www/zotero/misc/$i
66
for j in *; do
77
find . -type f \( ! -name *.sql \) -exec php {} \;
8-
find . -type f -name *.sql -exec bash -c 'mysql -h mysql -P 3306 -u root -pzotero zotero_master < {}' \;
8+
find . -type f -name *.sql -exec bash -c 'mariadb -h mysql -P 3306 -u root -pzotero zotero_master < {}' \;
99
done
1010
done;
1111
cd ../../

‎stack/dataserver/dbconfig/init-mysql.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -ux
44

55

6-
MYSQL="mysql -h mysql -P 3306 -u root -pzotero"
6+
MYSQL="mariadb -h mysql -P 3306 -u root -pzotero"
77

88
echo "DROP DATABASE IF EXISTS zotero_master" | $MYSQL
99
echo "DROP DATABASE IF EXISTS zotero_shard_1" | $MYSQL

‎stack/dataserver/ds.Dockerfile‎

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.17 AS stage1
1+
FROM alpine:3 AS stage1
22
ARG ZOTPRIME_VERSION=2
33
RUN set -eux; \
44
apk update && apk upgrade --available; \
@@ -17,54 +17,52 @@ RUN set -eux; \
1717
mariadb-client \
1818
memcached \
1919
net-tools \
20-
php81 \
21-
php81-apache2 \
22-
php81-bcmath \
23-
php81-calendar \
24-
php81-cli \
25-
php81-common \
26-
php81-ctype \
27-
php81-curl \
28-
php81-dev \
29-
php81-dom \
30-
php81-exif \
31-
php81-ffi \
32-
php81-ftp \
33-
php81-gettext \
34-
php81-iconv \
35-
php81-intl \
36-
php81-json \
37-
php81-mbstring \
38-
php81-mysqli \
39-
php81-opcache \
40-
php81-pcntl \
41-
php81-pdo_mysql \
42-
php81-pdo_pgsql \
43-
php81-pear \
44-
php81-pecl-igbinary \
45-
php81-pecl-memcached \
46-
php81-pecl-msgpack \
47-
php81-pecl-redis \
48-
php81-pecl-xdebug \
49-
php81-pgsql \
50-
php81-phar \
51-
php81-posix \
52-
php81-session \
53-
php81-sodium \
54-
php81-shmop \
55-
php81-simplexml \
56-
php81-sockets \
57-
php81-sysvmsg \
58-
php81-sysvsem \
59-
php81-sysvshm \
60-
php81-tidy \
61-
php81-tokenizer \
62-
php81-xml \
63-
php81-xmlreader \
64-
php81-xmlwriter \
65-
php81-xsl \
66-
php81-zip \
67-
php81-zlib \
20+
php83 \
21+
php83-apache2 \
22+
php83-bcmath \
23+
php83-calendar \
24+
php83-cli \
25+
php83-common \
26+
php83-ctype \
27+
php83-curl \
28+
php83-dev \
29+
php83-dom \
30+
php83-exif \
31+
php83-ffi \
32+
php83-ftp \
33+
php83-gettext \
34+
php83-iconv \
35+
php83-intl \
36+
php83-mbstring \
37+
php83-mysqli \
38+
php83-opcache \
39+
php83-pcntl \
40+
php83-pdo_mysql \
41+
php83-pdo_pgsql \
42+
php83-pear \
43+
php83-pecl-igbinary \
44+
php83-pecl-memcached \
45+
php83-pecl-msgpack \
46+
php83-pecl-redis \
47+
php83-pecl-xdebug \
48+
php83-pgsql \
49+
php83-phar \
50+
php83-posix \
51+
php83-session \
52+
php83-sodium \
53+
php83-shmop \
54+
php83-simplexml \
55+
php83-sockets \
56+
php83-sysvmsg \
57+
php83-sysvsem \
58+
php83-sysvshm \
59+
php83-tidy \
60+
php83-tokenizer \
61+
php83-xml \
62+
php83-xmlreader \
63+
php83-xmlwriter \
64+
php83-xsl \
65+
php83-zip \
6866
runit \
6967
sudo \
7068
unzip \
@@ -76,6 +74,7 @@ FROM stage1 AS stage2
7674
RUN set -eux; \
7775
apk update && apk upgrade --available \
7876
&& apk add --update --no-cache \
77+
&& ln -sf /usr/bin/php83 /usr/bin/php \
7978
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
8079
&& composer require --no-plugins --no-scripts pear/http_request2 \
8180
&& rm -rf /tmp/pear \
@@ -94,14 +93,14 @@ RUN set -eux; \
9493
# printf "\n<Directory \"/var/www/zotero/htdocs\">\n\tAllowOverride All\n</Directory>\n" >> /etc/apache2/httpd.conf
9594

9695
RUN set -eux; \
97-
sed -i 's/memory_limit = 128M/memory_limit = 1G/g' /etc/php81/php.ini; \
98-
sed -i 's/max_execution_time = 30/max_execution_time = 300/g' /etc/php81/php.ini; \
99-
sed -i 's/short_open_tag = Off/short_open_tag = On/g' /etc/php81/php.ini; \
100-
sed -i 's/display_errors = On/display_errors = Off/g' /etc/php81/php.ini; \
101-
sed -i 's/error_reporting = E_ALL \& ~E_DEPRECATED \& ~E_STRICT/error_reporting = E_ALL \& ~E_NOTICE \& ~E_STRICT \& ~E_DEPRECATED/g' /etc/php81/php.ini
102-
# sed -i 's/display_errors = Off/display_errors = On/g' /etc/php81/php.ini; \
103-
# sed -i 's/error_reporting = E_ALL \& ~E_DEPRECATED \& ~E_STRICT/error_reporting = E_ALL \& ~E_NOTICE/g' /etc/php81/php.ini
104-
# sed -i 's/error_reporting = E_ALL \& ~E_DEPRECATED \& ~E_STRICT/error_reporting = E_ALL \| E_NOTICE \| E_WARNING/g' /etc/php81/php.ini
96+
sed -i 's/memory_limit = 128M/memory_limit = 1G/g' /etc/php83/php.ini; \
97+
sed -i 's/max_execution_time = 30/max_execution_time = 300/g' /etc/php83/php.ini; \
98+
sed -i 's/short_open_tag = Off/short_open_tag = On/g' /etc/php83/php.ini; \
99+
sed -i 's/display_errors = On/display_errors = Off/g' /etc/php83/php.ini; \
100+
sed -i 's/error_reporting = E_ALL \& ~E_DEPRECATED \& ~E_STRICT/error_reporting = E_ALL \& ~E_NOTICE \& ~E_STRICT \& ~E_DEPRECATED/g' /etc/php83/php.ini
101+
# sed -i 's/display_errors = Off/display_errors = On/g' /etc/php83/php.ini; \
102+
# sed -i 's/error_reporting = E_ALL \& ~E_DEPRECATED \& ~E_STRICT/error_reporting = E_ALL \& ~E_NOTICE/g' /etc/php83/php.ini
103+
# sed -i 's/error_reporting = E_ALL \& ~E_DEPRECATED \& ~E_STRICT/error_reporting = E_ALL \| E_NOTICE \| E_WARNING/g' /etc/php83/php.ini
105104

106105
# Enable the new virtualhost
107106
COPY config/zotero.conf /etc/apache2/conf.d/

‎stack/db/db.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# mariadb image
44
############################
55

6-
FROM mariadb:10
6+
FROM mariadb:12

0 commit comments

Comments
 (0)