Commit 927b6e58 authored by Christian Kuhn's avatar Christian Kuhn
Browse files

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

Merge pull request #16 in T3COM/bamboo-remote-agent from feature/INFRA-154-php55-rebuild-bamboo-agents to release/php55

* commit '9909cd5f':
  [TASK] Bump version 1.0.1
  [TASK] git ignore further build directories
  [TASK] Base on baseimage 1.0 instead of specific 1.0.0
  [TASK] Add parallel as default package
  [TASK] Update nodejs during build
  [TASK] Simplify Makefile
parents 0c44a4d5 9909cd5f
.DS_Store
.vagrant
php55_image
php56_image
php70_image
php71_image
.idea
.idea
\ No newline at end of file
NAME = typo3gmbh/bamboo-remote-agent
MAJOR=1
MINOR=0
PATCHLEVEL=0
PATCHLEVEL=1
FULLVERSION=$(MAJOR).$(MINOR).$(PATCHLEVEL)
SHORTVERSION=$(MAJOR).$(MINOR)
.PHONY: all build_all \
build_php55 \
tag_latest release clean clean_images
.PHONY: \
all \
build \
release \
clean \
clean_images
all: build_all
all: build
build_all: \
build_php55
# Docker doesn't support sharing files between different Dockerfiles. -_-
# So we copy things around.
build_php55:
build:
rm -rf php55_image
cp -pR image php55_image
echo system.imageVersion=$(FULLVERSION) >> php55_image/config/bamboo/bamboo-capabilities.properties
echo final=1 >> php55_image/buildconfig
docker build -t $(NAME)-php55:$(FULLVERSION) --rm php55_image
docker tag $(NAME)-php55:$(FULLVERSION) $(NAME)-php55:$(SHORTVERSION)
tag_latest:
docker tag $(NAME)-php55:$(FULLVERSION) $(NAME)-php55:latest
release: tag_latest
release:
@if ! docker images $(NAME)-php55 | awk '{ print $$2 }' | grep -q -F $(FULLVERSION); then echo "$(NAME)-php55 version $(FULLVERSION) is not yet built. Please run 'make build'"; false; fi
docker tag $(NAME)-php55:$(FULLVERSION) $(NAME)-php55:$(SHORTVERSION)
docker tag $(NAME)-php55:$(FULLVERSION) $(NAME)-php55:latest
docker push $(NAME)-php55:latest
docker push $(NAME)-php55:$(FULLVERSION)
docker push $(NAME)-php55:$(SHORTVERSION)
# @echo "*** Don't forget to create a tag. git tag rel-$(FULLVERSION) && git push origin rel-$(FULLVERSION)"
clean:
rm -rf php55_image
clean_images:
docker rmi $(NAME)-php55:latest $(NAME)-php55:$(FULLVERSION) || true
docker rmi $(NAME)-php55:latest $(NAME)-php55:$(SHORTVERSION) $(NAME)-php55:$(FULLVERSION) || true
\ No newline at end of file
FROM typo3gmbh/baseimage:1.0.0
FROM typo3gmbh/baseimage:1.0
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
......
......@@ -16,9 +16,4 @@ rm -rf \
/usr/include/php/20151012/ext/apcu/ \
#
if [[ "$final" = 1 ]]; then
rm -rf /pd_build
else
rm -f /pd_build/{install,enable_repos,prepare,pups,nginx-passenger,finalize}.sh
rm -f /pd_build/{Dockerfile,insecure_key*}
fi
rm -rf /pd_build
......@@ -3,5 +3,8 @@ set -e
source /pd_build/buildconfig
set -x
## Install Node.js (also needed for Rails asset compilation)
## Install Node.js
minimal_apt_get_install nodejs
## And update nodejs on global level
npm update -g
\ No newline at end of file
......@@ -19,6 +19,7 @@ minimal_apt_get_install \
language-pack-de \
language-pack-en \
openjdk-8-jre-headless \
parallel \
#
# git-cherry-pick
......
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