Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ai3
docker
roundcube
Commits
2deeb901
Commit
2deeb901
authored
Apr 23, 2020
by
godog
Browse files
Switch to Buster and php 7.3
parent
d011e2ba
Pipeline
#6561
passed with stage
in 2 minutes and 34 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Dockerfile
View file @
2deeb901
...
...
@@ -6,7 +6,7 @@ ADD . /build
RUN
apt-get
-q
update
&&
env
DEBIAN_FRONTEND
=
noninteractive apt-get
-qy
install
--no-install-recommends
bash curl make patch rsync default-jre-headless wget unzip
RUN
/build/install-roundcube
--version
=
${
RC_VERSION
}
--destdir
=
/build/src build
&&
echo
${
RC_VERSION
}
>
/build/src/.rc_version
FROM
registry.git.autistici.org/ai3/docker/apache2-php-base:
ma
ster
FROM
registry.git.autistici.org/ai3/docker/apache2-php-base:
bu
ster
COPY
conf /tmp/conf
COPY
build.sh /tmp/build.sh
...
...
build.sh
View file @
2deeb901
...
...
@@ -14,26 +14,23 @@ BUILD_PACKAGES="rsync"
# Packages required to serve the website and run the services, in
# addition to those already installed by the base apache2 image.
PACKAGES
=
"
libapache2-mod-sso
php-gd
php-imap
php-mcrypt
php-mbstring
php-xml
php-zip
mysql-client
libapache2-mod-sso
php-imap
php-xml
php-zip
mariadb-client
"
# Apache modules to enable.
APACHE_MODULES_ENABLE
=
"
rewrite
sso
unique_id
rewrite
sso
unique_id
"
# Sites to enable.
APACHE_SITES
=
"
webmail
webmail
"
# The default bitnami/minideb image defines an 'install_packages'
...
...
conf/php/7.
0
/fpm/pool.d/www.conf
→
conf/php/7.
3
/fpm/pool.d/www.conf
View file @
2deeb901
[
www
]
listen
= /
run
/
php
/
php7
.
0
-
fpm
.
sock
listen
= /
run
/
php
/
php7
.
3
-
fpm
.
sock
pm
=
dynamic
pm
.
max_children
=
80
...
...
@@ -27,7 +27,6 @@ php_admin_value[opcache.memory_consumption] = 64
php_admin_value
[
opcache
.
interned_strings_buffer
] =
16
php_admin_value
[
opcache
.
max_accelerated_files
] =
4000
php_admin_value
[
opcache
.
validate_timestamps
] =
0
php_admin_value
[
opcache
.
fast_shutdown
] =
1
php_admin_value
[
upload_max_filesize
] =
20
M
php_admin_value
[
post_max_size
] =
20
M
start.sh
View file @
2deeb901
...
...
@@ -48,7 +48,7 @@ if [ -z "${cur_version}" ]; then
${
MYSQL
}
-e
"create table rc_version (version text); insert into rc_version (version) values ('unknown')"
${
MYSQL_DB
}
\
||
die
"could not create rc_version table in
${
MYSQL_DB
}
"
fi
# Run database upgrade if necessary.
if
[
"
${
rc_version
}
"
!=
"
${
cur_version
}
"
]
;
then
${
TARGET_DIR
}
/bin/update.sh
-v
${
cur_version
}
-y
\
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment