Skip to content

GitLab

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

[FEATURE] Kickstart php 7.2

parent 3f4f8a6f
Hide whitespace changes
Inline Side-by-side
Makefile
View file @ 55366473
NAME_BASEIMAGE = typo3gmbh/baseimage
MAJOR_BASEIMAGE=1
MINOR_BASEIMAGE=0
PATCHLEVEL_BASEIMAGE=8
PATCHLEVEL_BASEIMAGE=9
FULLVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE).$(PATCHLEVEL_BASEIMAGE)
SHORTVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE)
......@@ -9,88 +9,102 @@ SHORTVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE)
NAME_PHP53 = typo3gmbh/php53
MAJOR_PHP53=1
MINOR_PHP53=0
PATCHLEVEL_PHP53=7
PATCHLEVEL_PHP53=8
FULLVERSION_PHP53=$(MAJOR_PHP53).$(MINOR_PHP53).$(PATCHLEVEL_PHP53)
SHORTVERSION_PHP53=$(MAJOR_PHP53).$(MINOR_PHP53)
NAME_PHP54 = typo3gmbh/php54
MAJOR_PHP54=1
MINOR_PHP54=0
PATCHLEVEL_PHP54=7
PATCHLEVEL_PHP54=8
FULLVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54).$(PATCHLEVEL_PHP54)
SHORTVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54)
NAME_PHP55 = typo3gmbh/php55
MAJOR_PHP55=1
MINOR_PHP55=0
PATCHLEVEL_PHP55=6
PATCHLEVEL_PHP55=7
FULLVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55).$(PATCHLEVEL_PHP55)
SHORTVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55)
NAME_PHP56 = typo3gmbh/php56
MAJOR_PHP56=1
MINOR_PHP56=0
PATCHLEVEL_PHP56=5
PATCHLEVEL_PHP56=6
FULLVERSION_PHP56=$(MAJOR_PHP56).$(MINOR_PHP56).$(PATCHLEVEL_PHP56)
SHORTVERSION_PHP56=$(MAJOR_PHP56).$(MINOR_PHP56)
NAME_PHP70 = typo3gmbh/php70
MAJOR_PHP70=1
MINOR_PHP70=0
PATCHLEVEL_PHP70=10
PATCHLEVEL_PHP70=11
FULLVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70).$(PATCHLEVEL_PHP70)
SHORTVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70)
NAME_PHP71 = typo3gmbh/php71
MAJOR_PHP71=1
MINOR_PHP71=0
PATCHLEVEL_PHP71=10
PATCHLEVEL_PHP71=11
FULLVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71).$(PATCHLEVEL_PHP71)
SHORTVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71)
NAME_PHP72 = typo3gmbh/php72
MAJOR_PHP72=1
MINOR_PHP72=0
PATCHLEVEL_PHP72=0
FULLVERSION_PHP72=$(MAJOR_PHP72).$(MINOR_PHP72).$(PATCHLEVEL_PHP72)
SHORTVERSION_PHP72=$(MAJOR_PHP72).$(MINOR_PHP72)
NAME_BAMBOO_PHP53 = typo3gmbh/bamboo-remote-agent-php53
MAJOR_BAMBOO_PHP53=1
MINOR_BAMBOO_PHP53=0
PATCHLEVEL_BAMBOO_PHP53=5
PATCHLEVEL_BAMBOO_PHP53=6
FULLVERSION_BAMBOO_PHP53=$(MAJOR_BAMBOO_PHP53).$(MINOR_BAMBOO_PHP53).$(PATCHLEVEL_BAMBOO_PHP53)
SHORTVERSION_BAMBOO_PHP53=$(MAJOR_BAMBOO_PHP53).$(MINOR_BAMBOO_PHP53)
NAME_BAMBOO_PHP54 = typo3gmbh/bamboo-remote-agent-php54
MAJOR_BAMBOO_PHP54=1
MINOR_BAMBOO_PHP54=0
PATCHLEVEL_BAMBOO_PHP54=5
PATCHLEVEL_BAMBOO_PHP54=6
FULLVERSION_BAMBOO_PHP54=$(MAJOR_BAMBOO_PHP54).$(MINOR_BAMBOO_PHP54).$(PATCHLEVEL_BAMBOO_PHP54)
SHORTVERSION_BAMBOO_PHP54=$(MAJOR_BAMBOO_PHP54).$(MINOR_BAMBOO_PHP54)
NAME_BAMBOO_PHP55 = typo3gmbh/bamboo-remote-agent-php55
MAJOR_BAMBOO_PHP55=1
MINOR_BAMBOO_PHP55=0
PATCHLEVEL_BAMBOO_PHP55=8
PATCHLEVEL_BAMBOO_PHP55=9
FULLVERSION_BAMBOO_PHP55=$(MAJOR_BAMBOO_PHP55).$(MINOR_BAMBOO_PHP55).$(PATCHLEVEL_BAMBOO_PHP55)
SHORTVERSION_BAMBOO_PHP55=$(MAJOR_BAMBOO_PHP55).$(MINOR_BAMBOO_PHP55)
NAME_BAMBOO_PHP56 = typo3gmbh/bamboo-remote-agent-php56
MAJOR_BAMBOO_PHP56=1
MINOR_BAMBOO_PHP56=0
PATCHLEVEL_BAMBOO_PHP56=8
PATCHLEVEL_BAMBOO_PHP56=9
FULLVERSION_BAMBOO_PHP56=$(MAJOR_BAMBOO_PHP56).$(MINOR_BAMBOO_PHP56).$(PATCHLEVEL_BAMBOO_PHP56)
SHORTVERSION_BAMBOO_PHP56=$(MAJOR_BAMBOO_PHP56).$(MINOR_BAMBOO_PHP56)
NAME_BAMBOO_PHP70 = typo3gmbh/bamboo-remote-agent-php70
MAJOR_BAMBOO_PHP70=1
MINOR_BAMBOO_PHP70=0
PATCHLEVEL_BAMBOO_PHP70=25
PATCHLEVEL_BAMBOO_PHP70=26
FULLVERSION_BAMBOO_PHP70=$(MAJOR_BAMBOO_PHP70).$(MINOR_BAMBOO_PHP70).$(PATCHLEVEL_BAMBOO_PHP70)
SHORTVERSION_BAMBOO_PHP70=$(MAJOR_BAMBOO_PHP70).$(MINOR_BAMBOO_PHP70)
NAME_BAMBOO_PHP71 = typo3gmbh/bamboo-remote-agent-php71
MAJOR_BAMBOO_PHP71=1
MINOR_BAMBOO_PHP71=0
PATCHLEVEL_BAMBOO_PHP71=17
PATCHLEVEL_BAMBOO_PHP71=18
FULLVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71).$(PATCHLEVEL_BAMBOO_PHP71)
SHORTVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71)
NAME_BAMBOO_PHP72 = typo3gmbh/bamboo-remote-agent-php72
MAJOR_BAMBOO_PHP72=1
MINOR_BAMBOO_PHP72=0
PATCHLEVEL_BAMBOO_PHP72=0
FULLVERSION_BAMBOO_PHP72=$(MAJOR_BAMBOO_PHP72).$(MINOR_BAMBOO_PHP72).$(PATCHLEVEL_BAMBOO_PHP72)
SHORTVERSION_BAMBOO_PHP72=$(MAJOR_BAMBOO_PHP72).$(MINOR_BAMBOO_PHP72)
.PHONY: \
......@@ -103,12 +117,14 @@ SHORTVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71)
build_php56 \
build_php70 \
build_php71 \
build_php72 \
build_bamboo_php53 \
build_bamboo_php54 \
build_bamboo_php55 \
build_bamboo_php56 \
build_bamboo_php70 \
build_bamboo_php71 \
build_bamboo_php72 \
release \
release_baseimage \
release_php53 \
......@@ -117,12 +133,14 @@ SHORTVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71)
release_php56 \
release_php70 \
release_php71 \
release_php72 \
release_bamboo_php53 \
release_bamboo_php54 \
release_bamboo_php55 \
release_bamboo_php56 \
release_bamboo_php70 \
release_bamboo_php71 \
release_bamboo_php72 \
clean \
clean_baseimage \
clean_php53 \
......@@ -131,12 +149,14 @@ SHORTVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71)
clean_php56 \
clean_php70 \
clean_php71 \
clean_php72 \
clean_bamboo_php53 \
clean_bamboo_php54 \
clean_bamboo_php55 \
clean_bamboo_php56 \
clean_bamboo_php70 \
clean_bamboo_php71 \
clean_bamboo_php72 \
clean_images \
clean_images_baseimage \
clean_images_php53 \
......@@ -145,12 +165,14 @@ SHORTVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71)
clean_images_php56 \
clean_images_php70 \
clean_images_php71 \
clean_images_php72 \
clean_images_bamboo_php53 \
clean_images_bamboo_php54 \
clean_images_bamboo_php55 \
clean_images_bamboo_php56 \
clean_images_bamboo_php70 \
clean_images_bamboo_php71
clean_images_bamboo_php71 \
clean_images_bamboo_php72
......@@ -171,7 +193,8 @@ build: \
build_bamboo_php55 \
build_bamboo_php56 \
build_bamboo_php70 \
build_bamboo_php71
build_bamboo_php71 \
build_bamboo_php72
release: \
......@@ -187,7 +210,8 @@ release: \
release_bamboo_php55 \
release_bamboo_php56 \
release_bamboo_php70 \
release_bamboo_php71
release_bamboo_php71 \
release_bamboo_php72
clean: \
......@@ -203,7 +227,8 @@ clean: \
clean_bamboo_php55 \
clean_bamboo_php56 \
clean_bamboo_php70 \
clean_bamboo_php71
clean_bamboo_php71 \
clean_bamboo_php72
clean_images: \
......@@ -214,12 +239,14 @@ clean_images: \
clean_images_php56 \
clean_images_php70 \
clean_images_php71 \
clean_images_php72 \
clean_images_bamboo_php53 \
clean_images_bamboo_php54 \
clean_images_bamboo_php55 \
clean_images_bamboo_php56 \
clean_images_bamboo_php70 \
clean_images_bamboo_php71
clean_images_bamboo_php71 \
clean_images_bamboo_php72
build_baseimage:
......@@ -391,6 +418,30 @@ clean_images_php71:
docker rmi $(NAME_PHP71):$(FULLVERSION_PHP71) || true
build_php72:
rm -rf build_php72
cp -pR php72 build_php72
docker build -t $(NAME_PHP72):$(FULLVERSION_PHP72) build_php72
docker tag $(NAME_PHP72):$(FULLVERSION_PHP72) $(NAME_PHP72):$(SHORTVERSION_PHP72)
release_php72:
@if ! docker images $(NAME_PHP72) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_PHP72); then \
echo "$(NAME_PHP72) version $(FULLVERSION_PHP72) is not yet built. Please run 'make build'"; false; \
fi
docker tag $(NAME_PHP72):$(FULLVERSION_PHP72) $(NAME_PHP72):latest
docker push $(NAME_PHP72):latest
docker push $(NAME_PHP72):$(FULLVERSION_PHP72)
docker push $(NAME_PHP72):$(SHORTVERSION_PHP72)
clean_php72:
rm -rf build_php72
clean_images_php72:
docker rmi $(NAME_PHP72):latest || true
docker rmi $(NAME_PHP72):$(SHORTVERSION_PHP72) || true
docker rmi $(NAME_PHP72):$(FULLVERSION_PHP72) || true
build_bamboo_php53:
rm -rf build_bamboo-php53
......@@ -540,3 +591,28 @@ clean_images_bamboo_php71:
docker rmi $(NAME_BAMBOO_PHP71):latest || true
docker rmi $(NAME_BAMBOO_PHP71):$(SHORTVERSION_BAMBOO_PHP71) || true
docker rmi $(NAME_BAMBOO_PHP71):$(FULLVERSION_BAMBOO_PHP71) || true
build_bamboo_php72:
rm -rf build_bamboo-php72
cp -pR bamboo-remote-agent-php72 build_bamboo-php72
echo system.imageVersion=$(FULLVERSION_BAMBOO_PHP72) >> build_bamboo-php72/config/bamboo/bamboo-capabilities.properties
docker build -t $(NAME_BAMBOO_PHP72):$(FULLVERSION_BAMBOO_PHP72) build_bamboo-php72
release_bamboo_php72:
@if ! docker images $(NAME_BAMBOO_PHP72) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_BAMBOO_PHP72); then \
echo "$(NAME_BAMBOO_PHP72) version $(FULLVERSION_BAMBOO_PHP72) is not yet built. Please run 'make build'"; false; \
fi
docker tag $(NAME_BAMBOO_PHP72):$(FULLVERSION_BAMBOO_PHP72) $(NAME_BAMBOO_PHP72):$(SHORTVERSION_BAMBOO_PHP72)
docker tag $(NAME_BAMBOO_PHP72):$(FULLVERSION_BAMBOO_PHP72) $(NAME_BAMBOO_PHP72):latest
docker push $(NAME_BAMBOO_PHP72):latest
docker push $(NAME_BAMBOO_PHP72):$(FULLVERSION_BAMBOO_PHP72)
docker push $(NAME_BAMBOO_PHP72):$(SHORTVERSION_BAMBOO_PHP72)
clean_bamboo_php72:
rm -rf build_bamboo-php72
clean_images_bamboo_php72:
docker rmi $(NAME_BAMBOO_PHP72):latest || true
docker rmi $(NAME_BAMBOO_PHP72):$(SHORTVERSION_BAMBOO_PHP72) || true
docker rmi $(NAME_BAMBOO_PHP72):$(FULLVERSION_BAMBOO_PHP72) || true
bamboo-remote-agent-php72/Dockerfile 0 → 100644
View file @ 55366473
FROM typo3gmbh/php72:1.0
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
RUN /pd_build/install.sh
CMD ["/sbin/my_init"]
bamboo-remote-agent-php72/bamboo-agent.sh 0 → 100755
View file @ 55366473
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
# Create bamboo work directory
mkdir -p /srv/bamboo-agent-home
chmod 0775 /srv/bamboo-agent-home
chown bamboo:bamboo /srv/bamboo-agent-home
# Install bamboo remote agent
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/ -o /tmp/bamboo-installer.jar
/usr/bin/java -Dbamboo.home=/srv/bamboo-agent-home -jar /tmp/bamboo-installer.jar https://bamboo.typo3.com/agentServer install
chown -R bamboo:bamboo /srv/bamboo-agent-home
rm -f /tmp/bamboo-installer.jar
## Configure properties
cp -a /pd_build/config/bamboo/bamboo-capabilities.properties /srv/bamboo-agent-home/bin
## Enable agent
cp -a /pd_build/runit/bamboo-agent /etc/service/bamboo-agent
bamboo-remote-agent-php72/buildconfig 0 → 100644
View file @ 55366473
export LC_ALL=C
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 "$@"
}
bamboo-remote-agent-php72/finalize.sh 0 → 100755
View file @ 55366473
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
apt-get clean
rm -rf \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/* \
/usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
#
rm -rf /pd_build
bamboo-remote-agent-php72/install.sh 0 → 100755
View file @ 55366473
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
/pd_build/prepare.sh
/pd_build/bamboo-agent.sh
/pd_build/finalize.sh
bamboo-remote-agent-php72/prepare.sh 0 → 100755
View file @ 55366473
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
## Create a user for the bamboo agent.
addgroup --gid 9999 bamboo
adduser --uid 9999 --gid 9999 --disabled-password --gecos "Bamboo Remote Agent" bamboo
bamboo-remote-agent-php72/runit/bamboo-agent/log/run 0 → 100755
View file @ 55366473
#!/bin/sh
mkdir -p /var/log/bamboo-agent
exec svlogd -tt /var/log/bamboo-agent
bamboo-remote-agent-php72/runit/bamboo-agent/run 0 → 100755
View file @ 55366473
#!/bin/sh
exec 2>&1
exec /sbin/setuser bamboo /srv/bamboo-agent-home/bin/bamboo-agent.sh console
php72/Dockerfile 0 → 100644
View file @ 55366473
FROM typo3gmbh/baseimage:1.0
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
RUN /pd_build/install.sh
CMD ["/sbin/my_init"]
php72/buildconfig 0 → 100644
View file @ 55366473
export LC_ALL=C
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 "$@"
}
php72/chrome.sh 0 → 100755
View file @ 55366473
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
# xvfb and some hard dependencies of firefox
minimal_apt_get_install \
xvfb \
gconf2 \
google-chrome-stable \
#
mkdir /tmp/.X11-unix
chmod 1777 /tmp/.X11-unix
chown root /tmp/.X11-unix/
\ No newline at end of file
php72/config/mysql/grants.sql 0 → 100644
View file @ 55366473
GRANT ALL ON `func\_%`.* to funcu@'%' IDENTIFIED BY 'funcp' WITH GRANT OPTION;
FLUSH PRIVILEGES;
php72/config/mysql/init-file.cnf 0 → 100644
View file @ 55366473
[mysqld]
init-file=/etc/mysql/grants.sql
php72/enable_repos.sh 0 → 100755
View file @ 55366473
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
# ondrej with php 7.2
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 \
#
# mssql and tools
curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
curl https://packages.microsoft.com/config/ubuntu/16.04/mssql-server.list | tee /etc/apt/sources.list.d/mssql-server.list
curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | tee /etc/apt/sources.list.d/msprod.list
# google-chrome
curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list
# NodeSource's Node.js repository
curl --fail -sL https://deb.nodesource.com/setup_8.x | bash -
\ No newline at end of file
php72/finalize.sh 0 → 100755
View file @ 55366473
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
# remove a ton of packages needed for compilation of apcu and apcu-bc
apt-get remove -y --purge \
autoconf \
automake \
autotools-dev \
build-essential \
dpkg-dev \
file \
libpcre16-3 \
libpcre3-dev \
libpcre32-3 \
libpcrecpp0v5 \
libquadmath0 \
libssl-dev \
libtool \
linux-libc-dev \
m4 \
php7.1-dev \
shtool \
zlib1g-dev \
#
# but keep make and g++ ... to not confuse with above list, just install again if needed
minimal_apt_get_install \
make \
g++
apt-get clean
rm -rf \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/* \
/usr/local/src/* \
#
rm -rf /pd_build
php72/install.sh 0 → 100755
View file @ 55366473
#!/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/postgres.sh
/pd_build/mssql.sh
/pd_build/redis-server.sh
/pd_build/memcached.sh
/pd_build/nodejs.sh
/pd_build/php.sh
/pd_build/chrome.sh
/pd_build/finalize.sh
php72/memcached.sh 0 → 100755
View file @ 55366473
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
minimal_apt_get_install \
memcached \
#
cp -a /pd_build/runit/memcached /etc/service/memcached
php72/mssql.sh 0 → 100755
View file @ 55366473
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
ACCEPT_EULA=Y minimal_apt_get_install \
mssql-server \
sudo \
mssql-tools \
unixodbc-dev \
#
SA_PASSWORD='Test1234!' /opt/mssql/lib/mssql-conf/mssql-conf.py setup accept-eula || true
## Enable mysql
cp -a /pd_build/runit/mssql /etc/service/mssql
\ No newline at end of file
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