Commit 2a934dcc authored by Christian Kuhn's avatar Christian Kuhn
Browse files

Merge pull request #20 in T3COM/bamboo-remote-agent from...

Merge pull request #20 in T3COM/bamboo-remote-agent from feature/INFRA-162-bamboo-images-separate-agent-from to develop

* commit 'd2b14c01':
  [TASK] Bump minor versions
  [TASK] Rebase agent 55, 56, 70 images
  [TASK] Prepare php55, php56, php71
  [TASK] Fix comments
  [TASK] Remove nginx repo from php70
  [TASK] Update .gitignore with new temp dirs
  [TASK] Move bamboo-agent-php70 image on top of php70 image
  [TASK] Prepare php70
  [TASK] Remove EXPOSE 80 443 from Dockerfile
  [TASK] Prepare Makefile
parents 34e68327 d2b14c01
......@@ -2,6 +2,10 @@
.vagrant
*.swp
build_baseimage
build_php55
build_php56
build_php70
build_php71
build_bamboo-php55
build_bamboo-php56
build_bamboo-php70
......
NAME_BASEIMAGE = typo3gmbh/baseimage
MAJOR_BASEIMAGE=1
MINOR_BASEIMAGE=0
PATCHLEVEL_BASEIMAGE=2
PATCHLEVEL_BASEIMAGE=3
FULLVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE).$(PATCHLEVEL_BASEIMAGE)
SHORTVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE)
NAME_PHP55 = typo3gmbh/php55
MAJOR_PHP55=1
MINOR_PHP55=0
PATCHLEVEL_PHP55=0
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=0
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=0
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=0
FULLVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71).$(PATCHLEVEL_PHP71)
SHORTVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71)
NAME_BAMBOO_PHP55 = typo3gmbh/bamboo-remote-agent-php55
MAJOR_BAMBOO_PHP55=1
MINOR_BAMBOO_PHP55=0
PATCHLEVEL_BAMBOO_PHP55=2
PATCHLEVEL_BAMBOO_PHP55=3
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=2
PATCHLEVEL_BAMBOO_PHP56=3
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=14
PATCHLEVEL_BAMBOO_PHP70=15
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=6
PATCHLEVEL_BAMBOO_PHP71=7
FULLVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71).$(PATCHLEVEL_BAMBOO_PHP71)
SHORTVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71)
.PHONY: \
all \
build \
build_baseimage \
build_php55 \
build_php56 \
build_php70 \
build_php71 \
build_bamboo_php55 \
build_bamboo_php56 \
build_bamboo_php70 \
build_bamboo_php71 \
release \
release_baseimage \
release_php55 \
release_php56 \
release_php70 \
release_php71 \
release_bamboo_php55 \
release_bamboo_php56 \
release_bamboo_php70 \
release_bamboo_php71 \
clean \
clean_baseimage \
clean_php55 \
clean_php56 \
clean_php70 \
clean_php71 \
clean_bamboo_php55 \
clean_bamboo_php56 \
clean_bamboo_php70 \
clean_bamboo_php71 \
clean_images \
clean_images_baseimage \
clean_images_php55 \
clean_images_php56 \
clean_images_php70 \
clean_images_php71 \
clean_images_bamboo_php55 \
clean_images_bamboo_php56 \
clean_images_bamboo_php70 \
clean_images_bamboo_php71
all: \
build
build: \
build_baseimage \
build_php55 \
build_php56 \
build_php70 \
build_php71 \
build_bamboo_php55 \
build_bamboo_php56 \
build_bamboo_php70 \
......@@ -76,6 +128,10 @@ build: \
release: \
release_baseimage \
release_php55 \
release_php56 \
release_php70 \
release_php71 \
release_bamboo_php55 \
release_bamboo_php56 \
release_bamboo_php70 \
......@@ -84,6 +140,10 @@ release: \
clean: \
clean_baseimage \
clean_php55 \
clean_php56 \
clean_php70 \
clean_php71 \
clean_bamboo_php55 \
clean_bamboo_php56 \
clean_bamboo_php70 \
......@@ -92,6 +152,10 @@ clean: \
clean_images: \
clean_images_baseimage \
clean_images_php55 \
clean_images_php56 \
clean_images_php70 \
clean_images_php71 \
clean_images_bamboo_php55 \
clean_images_bamboo_php56 \
clean_images_bamboo_php70 \
......@@ -122,6 +186,104 @@ clean_images_baseimage:
docker rmi $(NAME_BASEIMAGE):latest || true
build_php55:
rm -rf build_php55
cp -pR php55 build_php55
docker build -t $(NAME_PHP55):$(FULLVERSION_PHP55) build_php55
docker tag $(NAME_PHP55):$(FULLVERSION_PHP55) $(NAME_PHP55):$(SHORTVERSION_PHP55)
release_php55:
@if ! docker images $(NAME_PHP55) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_PHP55); then \
echo "$(NAME_PHP55) version $(FULLVERSION_PHP55) is not yet built. Please run 'make build'"; false; \
fi
docker tag $(NAME_PHP55):$(FULLVERSION_PHP55) $(NAME_PHP55):latest
docker push $(NAME_PHP55):latest
docker push $(NAME_PHP55):$(FULLVERSION_PHP55)
docker push $(NAME_PHP55):$(SHORTVERSION_PHP55)
clean_php55:
rm -rf build_php55
clean_images_php55:
docker rmi $(NAME_PHP55):latest || true
docker rmi $(NAME_PHP55):$(SHORTVERSION_PHP55) || true
docker rmi $(NAME_PHP55):$(FULLVERSION_PHP55) || true
build_php56:
rm -rf build_php56
cp -pR php56 build_php56
docker build -t $(NAME_PHP56):$(FULLVERSION_PHP56) build_php56
docker tag $(NAME_PHP56):$(FULLVERSION_PHP56) $(NAME_PHP56):$(SHORTVERSION_PHP56)
release_php56:
@if ! docker images $(NAME_PHP56) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_PHP56); then \
echo "$(NAME_PHP56) version $(FULLVERSION_PHP56) is not yet built. Please run 'make build'"; false; \
fi
docker tag $(NAME_PHP56):$(FULLVERSION_PHP56) $(NAME_PHP56):latest
docker push $(NAME_PHP56):latest
docker push $(NAME_PHP56):$(FULLVERSION_PHP56)
docker push $(NAME_PHP56):$(SHORTVERSION_PHP56)
clean_php56:
rm -rf build_php56
clean_images_php56:
docker rmi $(NAME_PHP56):latest || true
docker rmi $(NAME_PHP56):$(SHORTVERSION_PHP56) || true
docker rmi $(NAME_PHP56):$(FULLVERSION_PHP56) || true
build_php70:
rm -rf build_php70
cp -pR php70 build_php70
docker build -t $(NAME_PHP70):$(FULLVERSION_PHP70) build_php70
docker tag $(NAME_PHP70):$(FULLVERSION_PHP70) $(NAME_PHP70):$(SHORTVERSION_PHP70)
release_php70:
@if ! docker images $(NAME_PHP70) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_PHP70); then \
echo "$(NAME_PHP70) version $(FULLVERSION_PHP70) is not yet built. Please run 'make build'"; false; \
fi
docker tag $(NAME_PHP70):$(FULLVERSION_PHP70) $(NAME_PHP70):latest
docker push $(NAME_PHP70):latest
docker push $(NAME_PHP70):$(FULLVERSION_PHP70)
docker push $(NAME_PHP70):$(SHORTVERSION_PHP70)
clean_php70:
rm -rf build_php70
clean_images_php70:
docker rmi $(NAME_PHP70):latest || true
docker rmi $(NAME_PHP70):$(SHORTVERSION_PHP70) || true
docker rmi $(NAME_PHP70):$(FULLVERSION_PHP70) || true
build_php71:
rm -rf build_php71
cp -pR php71 build_php71
docker build -t $(NAME_PHP71):$(FULLVERSION_PHP71) build_php71
docker tag $(NAME_PHP71):$(FULLVERSION_PHP71) $(NAME_PHP71):$(SHORTVERSION_PHP71)
release_php71:
@if ! docker images $(NAME_PHP71) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_PHP71); then \
echo "$(NAME_PHP71) version $(FULLVERSION_PHP71) is not yet built. Please run 'make build'"; false; \
fi
docker tag $(NAME_PHP71):$(FULLVERSION_PHP71) $(NAME_PHP71):latest
docker push $(NAME_PHP71):latest
docker push $(NAME_PHP71):$(FULLVERSION_PHP71)
docker push $(NAME_PHP71):$(SHORTVERSION_PHP71)
clean_php71:
rm -rf build_php71
clean_images_php71:
docker rmi $(NAME_PHP71):latest || true
docker rmi $(NAME_PHP71):$(SHORTVERSION_PHP71) || true
docker rmi $(NAME_PHP71):$(FULLVERSION_PHP71) || true
build_bamboo_php55:
rm -rf build_bamboo-php55
cp -pR bamboo-remote-agent-php55 build_bamboo-php55
......
FROM typo3gmbh/baseimage:1.0
FROM typo3gmbh/php55:1.0
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
RUN /pd_build/install.sh
CMD ["/sbin/my_init"]
EXPOSE 80 443
......@@ -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/* \
......
......@@ -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
......@@ -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
FROM typo3gmbh/baseimage:1.0
FROM typo3gmbh/php56:1.0
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
RUN /pd_build/install.sh
CMD ["/sbin/my_init"]
EXPOSE 80 443
......@@ -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/* \
......
......@@ -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
......@@ -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
FROM typo3gmbh/baseimage:1.0
FROM typo3gmbh/php70:1.0
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
RUN /pd_build/install.sh
CMD ["/sbin/my_init"]
EXPOSE 80 443
......@@ -3,9 +3,6 @@ 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 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/* \
......
......@@ -3,14 +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/firefox.sh
/pd_build/finalize.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
FROM typo3gmbh/baseimage:1.0
FROM typo3gmbh/php71:1.0
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
RUN /pd_build/install.sh
CMD ["/sbin/my_init"]
EXPOSE 80 443
......@@ -3,9 +3,6 @@ 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 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.1-dev shtool zlib1g-dev
apt-get clean
rm -rf \
/var/lib/apt/lists/* \
......
......@@ -3,14 +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/firefox.sh
/pd_build/finalize.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
FROM typo3gmbh/baseimage:1.0
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
RUN /pd_build/install.sh
CMD ["/sbin/my_init"]
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 "$@"
}
Supports Markdown
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