[TASK] Rebase agent 55, 56, 70 images

bamboo-remote-agent-php55/Dockerfile

-FROM typo3gmbh/baseimage:1.0
+FROM typo3gmbh/php55:1.0
 MAINTAINER TYPO3 GmbH <info@typo3.com>
 
 ADD . /pd_build

bamboo-remote-agent-php55/config/mysql/grants.sql

-GRANT ALL ON `func\_%`.* to funcu@'%' IDENTIFIED BY 'funcp' WITH GRANT OPTION;
-FLUSH PRIVILEGES;

bamboo-remote-agent-php55/config/mysql/init-file.cnf

-[mysqld]
-init-file=/etc/mysql/grants.sql

bamboo-remote-agent-php55/enable_repos.sh

-#!/bin/bash
-set -e
-source /pd_build/buildconfig
-set -x
-
-## ondrej with php 5.5
-echo deb http://ppa.launchpad.net/ondrej/php/ubuntu xenial main > /etc/apt/sources.list.d/php.list
-
-# 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 \
-  #
-
-## NodeSource's Node.js repository
-curl --fail -sL https://deb.nodesource.com/setup_4.x | bash -

bamboo-remote-agent-php55/finalize.sh

@@ -3,10 +3,6 @@ set -e
 source /pd_build/buildconfig
 set -x
 
-# remove a ton of packages needed for compilation of apcu and apcu-bc
-# commented until acpu is working again
-#apt-get remove -y --purge autoconf automake autotools-dev binutils cpp cpp-5 file gcc gcc-5 libasan2 libatomic1 libc-dev-bin libc6-dev libcc1-0 libcilkrts5 libgcc-5-dev libisl15 libitm1 liblsan0 libmpc3 libmpfr4 libmpx0 libpcre16-3 libpcre3-dev libpcre32-3 libpcrecpp0v5 libquadmath0 libsigsegv2 libssl-dev libtool libtsan0 libubsan0 linux-libc-dev m4 make php7.0-dev shtool zlib1g-dev
-
 apt-get clean
 rm -rf \
 	/var/lib/apt/lists/* \

bamboo-remote-agent-php55/install.sh

@@ -3,13 +3,6 @@ set -e
 source /pd_build/buildconfig
 set -x
 
-/pd_build/enable_repos.sh
 /pd_build/prepare.sh
 /pd_build/bamboo-agent.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

bamboo-remote-agent-php55/memcached.sh

-#!/bin/bash
-set -e
-source /pd_build/buildconfig
-set -x
-
-## Install Redis Server
-minimal_apt_get_install \
-  memcached \
-  #
-
-## Enable nginx daemon
-cp -a /pd_build/runit/memcached /etc/service/memcached

bamboo-remote-agent-php55/mysql.sh

-#!/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

bamboo-remote-agent-php55/nodejs.sh

-#!/bin/bash
-set -e
-source /pd_build/buildconfig
-set -x
-
-## Install Node.js
-minimal_apt_get_install nodejs
-
-## And update nodejs on global level
-npm update -g
\ No newline at end of file

bamboo-remote-agent-php55/php-finalize.sh

-#!/bin/bash
-set -e
-source /pd_build/buildconfig
-set -x
-
-## This script is to be run after php.sh.
-
-## Install common tools
-minimal_apt_get_install \
-  graphicsmagick \
-  zip \
-  unzip \
-  #
-
-# Install composer
-curl -sSL https://getcomposer.org/download/1.1.2/composer.phar -o /usr/bin/composer
-chmod +x /usr/bin/composer

bamboo-remote-agent-php55/php.sh

-#!/bin/bash
-set -e
-source /pd_build/buildconfig
-set -x
-
-minimal_apt_get_install \
-  php5.5 \
-  php5.5-bcmath \
-  php5.5-bz2 \
-  php5.5-cli \
-  php5.5-common \
-  php5.5-curl \
-  php5.5-gd \
-  php5.5-gmp \
-  php5.5-imap \
-  php5.5-intl \
-  php5.5-json \
-  php5.5-mbstring \
-  php5.5-mcrypt \
-  php5.5-mysql \
-  php5.5-opcache \
-  php5.5-pgsql \
-  php5.5-pspell \
-  php5.5-readline \
-  php5.5-recode \
-  php5.5-sqlite3 \
-  php5.5-xml \
-  php5.5-xmlrpc \
-  php5.5-xsl \
-  php5.5-zip \
-  php-redis \
-  php-memcached \
-  php-xdebug \
-  #
-
-## Enable phar writing
-sed -i s/';phar.readonly = On'/'phar.readonly = Off'/ /etc/php/5.5/cli/php.ini
-
-/pd_build/php-finalize.sh

bamboo-remote-agent-php55/prepare.sh

@@ -5,23 +5,4 @@ set -x
 
 ## Create a user for the bamboo agent.
 addgroup --gid 9999 bamboo
-addgroup --gid 9998 bambootest
 adduser --uid 9999 --gid 9999 --disabled-password --gecos "Bamboo Remote Agent" bamboo
-usermod -L -a -G bambootest bamboo
-
-## Install common packages
-minimal_apt_get_install \
-  ack-grep \
-  openssh-client \
-  bzip2 \
-  curl \
-  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

bamboo-remote-agent-php55/redis-server.sh

-#!/bin/bash
-set -e
-source /pd_build/buildconfig
-set -x
-
-## Install Redis Server
-minimal_apt_get_install \
-  redis-server \
-  #
-
-## Enable nginx daemon
-cp -a /pd_build/runit/redis-server /etc/service/redis-server

bamboo-remote-agent-php55/runit/memcached/log/run

-#!/bin/sh
-mkdir -p /var/log/memcached
-exec svlogd -tt /var/log/memcached

bamboo-remote-agent-php55/runit/memcached/run

-#!/bin/sh
-exec 2>&1
-exec chpst -u memcache /usr/bin/memcached -l 127.0.0.1 >>/var/log/memcached.log 2>&1

bamboo-remote-agent-php55/runit/mysql/log/run

-#!/bin/sh
-mkdir -p /var/log/mariadb
-exec svlogd -tt /var/log/mariadb

bamboo-remote-agent-php55/runit/mysql/run

-#!/bin/sh
-rm -rf /var/lib/mysql/*
-mysql_install_db
-exec 2>&1
-exec /usr/bin/mysqld_safe

bamboo-remote-agent-php55/runit/redis-server/log/run

-#!/bin/sh
-mkdir -p /var/log/redis-server
-exec svlogd -tt /var/log/redis-server

bamboo-remote-agent-php55/runit/redis-server/run

-#!/bin/sh
-exec 2>&1
-exec chpst -u redis /usr/bin/redis-server /etc/redis/redis.conf

bamboo-remote-agent-php56/Dockerfile

-FROM typo3gmbh/baseimage:1.0
+FROM typo3gmbh/php56:1.0
 MAINTAINER TYPO3 GmbH <info@typo3.com>
 
 ADD . /pd_build