Commit e5638d89 authored by Christian Kuhn's avatar Christian Kuhn
Browse files

[TASK] php54 without daemons

parent fabb4a8f
......@@ -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
......@@ -4,8 +4,3 @@ source /pd_build/buildconfig
set -x
apt-get update
# 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
......@@ -4,118 +4,119 @@ source /pd_build/buildconfig
set -x
apt-get remove -y --purge \
autoconf \
file \
flex \
krb5-multidev \
libapparmor-dev \
libapr1-dev \
libaprutil1-dev \
libaspell-dev \
libbsd-dev \
libbz2-dev \
libc-client2007e-dev \
libcurl4-openssl-dev \
libdb-dev \
libdb5.3-dev \
libexpat1-dev \
libfontconfig1-dev \
libfreetype6-dev \
libgcrypt11-dev \
libgcrypt20-dev \
libgd-dev \
libglib2.0-dev \
libgmp3-dev \
libgpg-error-dev \
libice-dev \
libidn11-dev \
libjbig-dev \
libjpeg-dev \
libjpeg-turbo8-dev \
libjpeg8-dev \
libkrb5-dev \
libldap2-dev \
libltdl-dev \
liblzma-dev \
libmagic-dev \
libmcrypt-dev \
libmhash-dev \
libmysqlclient-dev \
libonig-dev \
libpcre3-dev \
libpq-dev \
libpspell-dev \
libqdbm-dev \
libreadline-dev \
librecode-dev \
libsasl2-dev \
libsctp-dev \
libsm-dev \
libsqlite3-dev \
libsystemd-dev \
libtidy-dev \
libtiff5-dev \
libtool \
libvpx-dev \
libwebp-dev \
libxml2-dev \
libxmlrpc-epi-dev \
libxmltok1-dev \
libxpm-dev \
libxslt1-dev \
libxt-dev \
libzip-dev \
pkg-config \
re2c \
unixodbc-dev \
uuid-dev \
zlib1g-dev \
autotools-dev \
comerr-dev \
icu-devtools \
libc-client2007e \
libdpkg-perl \
libfl-dev \
libgmp-dev \
libgmpxx4ldbl \
libgnutls-openssl27 \
libgnutlsxx28 \
libgssrpc4 \
libicu-dev \
libisl15 \
libitm1 \
liblsan0 \
libmagic1 \
libmpc3 \
libmpx0 \
libp11-kit-dev \
libpam0g-dev \
libpthread-stubs0-dev \
libquadmath0 \
libreadline6-dev \
libstdc++-5-dev \
libtasn1-6-dev \
libtinfo-dev \
libtsan0 \
libubsan0 \
libx11-dev \
libxau-dev \
libxcb1-dev \
libxdmcp-dev \
m4 \
mlock \
nettle-dev \
x11proto-core-dev \
x11proto-input-dev \
x11proto-kb-dev \
xorg-sgml-doctools \
xtrans-dev \
#
autoconf \
file \
flex \
krb5-multidev \
libapparmor-dev \
libapr1-dev \
libaprutil1-dev \
libaspell-dev \
libbsd-dev \
libbz2-dev \
libc-client2007e-dev \
libcurl4-openssl-dev \
libdb-dev \
libdb5.3-dev \
libexpat1-dev \
libfontconfig1-dev \
libfreetype6-dev \
libgcrypt11-dev \
libgcrypt20-dev \
libgd-dev \
libglib2.0-dev \
libgmp3-dev \
libgpg-error-dev \
libice-dev \
libidn11-dev \
libjbig-dev \
libjpeg-dev \
libjpeg-turbo8-dev \
libjpeg8-dev \
libkrb5-dev \
libldap2-dev \
libltdl-dev \
liblzma-dev \
libmagic-dev \
libmcrypt-dev \
libmhash-dev \
libmysqlclient-dev \
libonig-dev \
libpcre3-dev \
libpq-dev \
libpspell-dev \
libqdbm-dev \
libreadline-dev \
librecode-dev \
libsasl2-dev \
libsctp-dev \
libsm-dev \
libsqlite3-dev \
libsystemd-dev \
libtidy-dev \
libtiff5-dev \
libtool \
libvpx-dev \
libwebp-dev \
libxml2-dev \
libxmlrpc-epi-dev \
libxmltok1-dev \
libxpm-dev \
libxslt1-dev \
libxt-dev \
libzip-dev \
pkg-config \
re2c \
unixodbc-dev \
uuid-dev \
zlib1g-dev \
autotools-dev \
comerr-dev \
icu-devtools \
libc-client2007e \
libdpkg-perl \
libfl-dev \
libgmp-dev \
libgmpxx4ldbl \
libgnutls-openssl27 \
libgnutlsxx28 \
libgssrpc4 \
libicu-dev \
libisl15 \
libitm1 \
liblsan0 \
libmagic1 \
libmpc3 \
libmpx0 \
libp11-kit-dev \
libpam0g-dev \
libpthread-stubs0-dev \
libquadmath0 \
libreadline6-dev \
libstdc++-5-dev \
libtasn1-6-dev \
libtinfo-dev \
libtsan0 \
libubsan0 \
libx11-dev \
libxau-dev \
libxcb1-dev \
libxdmcp-dev \
m4 \
mlock \
nettle-dev \
x11proto-core-dev \
x11proto-input-dev \
x11proto-kb-dev \
xorg-sgml-doctools \
xtrans-dev \
#
# but keep make and g++ ... to not confuse with above list, just install again if needed
minimal_apt_get_install \
make \
g++
make \
g++ \
#
apt-get clean
......@@ -123,10 +124,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
#!/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
......@@ -116,7 +116,8 @@ apt-get remove -y --purge \
# but keep make and g++ ... to not confuse with above list, just install again if needed
minimal_apt_get_install \
make \
g++
g++ \
#
apt-get clean
apt-get -y autoremove
......
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