Commit 19a87ba9 authored by Christian Kuhn's avatar Christian Kuhn
Browse files

[TASK] php56 without daemons

parent 93601b11
......@@ -2,5 +2,8 @@ FROM typo3gmbh/baseimage:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
RUN /pd_build/install.sh
CMD ["/sbin/my_init"]
RUN /pd_build/enable_repos.sh && \
/pd_build/nodejs.sh && \
/pd_build/php.sh && \
/pd_build/finalize.sh
......@@ -3,9 +3,9 @@ export DEBIAN_FRONTEND=noninteractive
function minimal_apt_get_install()
{
if [[ ! -e /var/lib/apt/lists/lock ]]; then
apt-get update
fi
apt-get install -y --no-install-recommends "$@"
if [[ ! -e /var/lib/apt/lists/lock ]]; then
apt-get update
fi
apt-get install -y --no-install-recommends "$@"
}
GRANT ALL ON `func\_%`.* to funcu@'%' IDENTIFIED BY 'funcp' WITH GRANT OPTION;
GRANT ALL ON `func\_%`.* to funcu@'localhost' IDENTIFIED BY 'funcp' WITH GRANT OPTION;
FLUSH PRIVILEGES;
[mysqld]
init-file=/etc/mysql/grants.sql
......@@ -5,23 +5,13 @@ set -x
apt-get update
## ondrej with php 5.6
# ondrej with php 5.6
echo deb http://ppa.launchpad.net/ondrej/php/ubuntu bionic main > /etc/apt/sources.list.d/php.list
minimal_apt_get_install \
dirmngr \
gpg-agent \
#
# The recv-keys part takes a bit of time, so it's faster to receive multiple keys at once.
# ondrej key - the recv-keys part takes a bit of time, so it's faster to receive multiple keys at once.
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys \
E5267A6C \
#
E5267A6C \
#
apt-get update
apt-get -y dist-upgrade
# Set a hard IP for some typo3.org services for now until maybe anytime server team decides
# to get DNS right again
echo "136.243.44.172 review.typo3.org" >> /etc/hosts
echo "136.243.44.172 git.typo3.org" >> /etc/hosts
\ No newline at end of file
......@@ -8,10 +8,10 @@ apt-get -y autoremove
rm -rf \
/var/lib/apt/lists/* \
/root/.npm/ \
/tmp/* \
/var/tmp/* \
/usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
#
/tmp/* \
/var/tmp/* \
/usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
#
rm -rf /pd_build
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
/pd_build/enable_repos.sh
/pd_build/prepare.sh
/pd_build/mysql.sh
/pd_build/redis-server.sh
/pd_build/memcached.sh
/pd_build/nodejs.sh
/pd_build/php.sh
/pd_build/finalize.sh
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
minimal_apt_get_install \
memcached \
#
cp -a /pd_build/runit/memcached /etc/service/memcached
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
## Install MariaDB
minimal_apt_get_install \
mariadb-client \
mariadb-server \
#
## Additional config files
cp /pd_build/config/mysql/*.cnf /etc/mysql/mariadb.conf.d/
## Provide grants.sql
cp /pd_build/config/mysql/grants.sql /etc/mysql/grants.sql
## Enable mysql
cp -a /pd_build/runit/mysql /etc/service/mysql
......@@ -4,46 +4,42 @@ source /pd_build/buildconfig
set -x
minimal_apt_get_install \
php5.6 \
php5.6-bcmath \
php5.6-bz2 \
php5.6-cli \
php5.6-common \
php5.6-curl \
php5.6-gd \
php5.6-gmp \
php5.6-imap \
php5.6-intl \
php5.6-json \
php5.6-mbstring \
php5.6-mcrypt \
php5.6-mysql \
php5.6-opcache \
php5.6-pgsql \
php5.6-pspell \
php5.6-readline \
php5.6-recode \
php5.6-sqlite3 \
php5.6-xml \
php5.6-xmlrpc \
php5.6-xsl \
php5.6-zip \
php-redis \
php-memcached \
php-xdebug \
#
php5.6 \
php5.6-bcmath \
php5.6-bz2 \
php5.6-cli \
php5.6-common \
php5.6-curl \
php5.6-gd \
php5.6-gmp \
php5.6-imap \
php5.6-intl \
php5.6-json \
php5.6-mbstring \
php5.6-mcrypt \
php5.6-mysql \
php5.6-opcache \
php5.6-pgsql \
php5.6-pspell \
php5.6-readline \
php5.6-recode \
php5.6-sqlite3 \
php5.6-xml \
php5.6-xmlrpc \
php5.6-xsl \
php5.6-zip \
php-redis \
php-memcached \
php-xdebug \
graphicsmagick \
imagemagick \
zip \
unzip \
#
## Enable phar writing
sed -i s/';phar.readonly = On'/'phar.readonly = Off'/ /etc/php/5.6/cli/php.ini
## Install common tools
minimal_apt_get_install \
graphicsmagick \
imagemagick \
zip \
unzip \
#
# Install composer
curl -sSL https://getcomposer.org/download/1.6.3/composer.phar -o /usr/bin/composer
chmod +x /usr/bin/composer
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
## Install common packages
minimal_apt_get_install \
ack-grep \
openssh-client \
bzip2 \
curl \
patch \
git \
language-pack-de \
language-pack-en \
openjdk-8-jre-headless \
parallel \
#
# git-cherry-pick
curl -Lo /usr/bin/gerrit-cherry-pick https://review.typo3.org/tools/bin/gerrit-cherry-pick
chmod +x /usr/bin/gerrit-cherry-pick
## Create a user for the bamboo agent.
addgroup --gid 9999 bamboo
adduser --uid 9999 --gid 9999 --disabled-password --gecos "Bamboo Remote Agent" bamboo
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
minimal_apt_get_install \
redis-server \
#
cp -a /pd_build/runit/redis-server /etc/service/redis-server
sed -i 's/daemonize yes/daemonize no/' /etc/redis/redis.conf
sed -i 's/bind 127.0.0.1 ::1/bind 127.0.0.1/' /etc/redis/redis.conf
#!/bin/sh
mkdir -p /var/log/memcached
exec svlogd -tt /var/log/memcached
#!/bin/sh
exec 2>&1
exec chpst -u memcache /usr/bin/memcached -l 127.0.0.1 >>/var/log/memcached.log 2>&1
#!/bin/sh
mkdir -p /var/log/mariadb
exec svlogd -tt /var/log/mariadb
#!/bin/sh
rm -rf /var/lib/mysql/*
mysql_install_db
exec 2>&1
exec /usr/bin/mysqld_safe
#!/bin/sh
mkdir -p /var/log/redis-server
exec svlogd -tt /var/log/redis-server
#!/bin/sh
exec 2>&1
exec chpst -u redis /usr/bin/redis-server /etc/redis/redis.conf
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment