Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
ai3
docker
roundcube
Commits
7c116162
Commit
7c116162
authored
Jul 13, 2019
by
ale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use apache2-php-base as base image
parent
1d507bb9
Pipeline
#3771
failed with stages
in 7 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
15 deletions
+3
-15
Dockerfile
Dockerfile
+1
-1
build.sh
build.sh
+2
-14
No files found.
Dockerfile
View file @
7c116162
FROM
registry.git.autistici.org/ai3/docker/apache2-base:master
FROM
registry.git.autistici.org/ai3/docker/apache2-
php-
base:master
COPY
conf /tmp/conf
COPY
build/src /var/www/webmail
...
...
build.sh
View file @
7c116162
...
...
@@ -15,8 +15,6 @@ BUILD_PACKAGES="rsync"
# addition to those already installed by the base apache2 image.
PACKAGES
=
"
libapache2-mod-sso
php-mysql
php-gd
php-imap
php-mcrypt
php-mbstring
...
...
@@ -31,22 +29,11 @@ APACHE_MODULES_ENABLE="
sso
unique_id
"
export
APACHE_MODULES_ENABLE
# Config snippets to enable for Apache.
APACHE_CONFIG_ENABLE
=
"
php7.0-fpm
"
export
APACHE_CONFIG_ENABLE
# Sites to enable.
APACHE_SITES
=
"
webmail
"
export
APACHE_SITES
# Use php-fpm.
export
PHP_FPM_ENABLE
=
1
# The default bitnami/minideb image defines an 'install_packages'
# command which is just a convenient helper. Define our own in
...
...
@@ -65,7 +52,8 @@ install_packages ${BUILD_PACKAGES} ${PACKAGES}
rsync
-a
/tmp/conf/ /etc/
# Setup Apache.
/usr/local/bin/setup-apache.sh
a2enmod
-q
${
APACHE_MODULES_ENABLE
}
a2ensite
${
APACHE_SITES
}
# Ensure that the startup script is executable.
chmod
755 /start.sh
...
...
Write
Preview
Markdown
is supported
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