Unverified Commit 757e6da9 authored by Susanne Moog's avatar Susanne Moog
Browse files

Merge branch '3.1.4'

parents cd4664e9 d8594bb4
......@@ -58,10 +58,16 @@ SHORTVERSION_PHP72=$(MAJOR_PHP72).$(MINOR_PHP72)
NAME_PHP73 = typo3gmbh/php73
MAJOR_PHP73=3
MINOR_PHP73=0
PATCHLEVEL_PHP73=8
PATCHLEVEL_PHP73=9
FULLVERSION_PHP73=$(MAJOR_PHP73).$(MINOR_PHP73).$(PATCHLEVEL_PHP73)
SHORTVERSION_PHP73=$(MAJOR_PHP73).$(MINOR_PHP73)
NAME_JS = typo3gmbh/js
MAJOR_JS=1
MINOR_JS=0
PATCHLEVEL_JS=0
FULLVERSION_JS=$(MAJOR_JS).$(MINOR_JS).$(PATCHLEVEL_JS)
SHORTVERSION_JS=$(MAJOR_JS).$(MINOR_JS)
NAME_BAMBOO = typo3gmbh/bamboo-remote-agent
MAJOR_BAMBOO=1
......@@ -84,6 +90,7 @@ SHORTVERSION_BAMBOO=$(MAJOR_BAMBOO).$(MINOR_BAMBOO)
build_php71 \
build_php72 \
build_php73 \
build_js \
build_bamboo \
release \
release_baseimage \
......@@ -95,6 +102,7 @@ SHORTVERSION_BAMBOO=$(MAJOR_BAMBOO).$(MINOR_BAMBOO)
release_php71 \
release_php72 \
release_php73 \
release_js \
release_bamboo \
clean \
clean_baseimage \
......@@ -106,6 +114,7 @@ SHORTVERSION_BAMBOO=$(MAJOR_BAMBOO).$(MINOR_BAMBOO)
clean_php71 \
clean_php72 \
clean_php73 \
clean_js \
clean_bamboo \
clean_images \
clean_images_baseimage \
......@@ -117,6 +126,7 @@ SHORTVERSION_BAMBOO=$(MAJOR_BAMBOO).$(MINOR_BAMBOO)
clean_images_php71 \
clean_images_php72 \
clean_images_php73 \
clean_images_js \
clean_images_bamboo
......@@ -127,7 +137,8 @@ all: \
build: \
build_baseimage \
build_php \
build_bamboo
build_bamboo \
build_js
build_php: \
build_php53 \
......@@ -142,7 +153,8 @@ build_php: \
release: \
release_baseimage \
release_php \
release_bamboo
release_bamboo \
release_js
release_php: \
release_php53 \
......@@ -164,7 +176,8 @@ clean: \
clean_php71 \
clean_php72 \
clean_php73 \
clean_bamboo
clean_bamboo \
clean_js
clean_images: \
......@@ -177,7 +190,8 @@ clean_images: \
clean_images_php71 \
clean_images_php72 \
clean_images_php73 \
clean_images_bamboo
clean_images_bamboo \
clean_js
build_baseimage:
......@@ -420,3 +434,28 @@ clean_images_bamboo:
docker rmi $(NAME_BAMBOO):latest || true
docker rmi $(NAME_BAMBOO):$(SHORTVERSION_BAMBOO) || true
docker rmi $(NAME_BAMBOO):$(FULLVERSION_BAMBOO) || true
build_js:
rm -rf build_js
cp -pR js build_js
docker build -t $(NAME_JS):$(FULLVERSION_JS) build_js
release_js:
@if ! docker images $(NAME_JS) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_JS); then \
echo "$(NAME_JS) version $(FULLVERSION_JS) is not yet built. Please run 'make build'"; false; \
fi
docker tag $(NAME_JS):$(FULLVERSION_JS) $(NAME_JS):$(SHORTVERSION_JS)
docker tag $(NAME_JS):$(FULLVERSION_JS) $(NAME_JS):latest
docker push $(NAME_JS):latest
docker push $(NAME_JS):$(FULLVERSION_JS)
docker push $(NAME_JS):$(SHORTVERSION_JS)
clean_js:
rm -rf build_js
clean_images_js:
docker rmi $(NAME_JS):latest || true
docker rmi $(NAME_JS):$(SHORTVERSION_JS) || true
docker rmi $(NAME_JS):$(FULLVERSION_JS) || true
FROM node:8
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
RUN /pd_build/enable_repos.sh && \
/pd_build/nodejs.sh && \
/pd_build/finalize.sh
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 "$@"
}
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
# Install deps + add Chrome Stable + purge all the things
apt-get update && apt-get install -y \
apt-transport-https \
ca-certificates \
curl \
gnupg \
--no-install-recommends \
&& curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
&& echo "deb https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
&& apt-get update && apt-get install -y \
google-chrome-beta \
fontconfig \
fonts-ipafont-gothic \
fonts-wqy-zenhei \
fonts-thai-tlwg \
fonts-kacst \
fonts-symbola \
fonts-noto \
ttf-freefont \
--no-install-recommends \
&& apt-get purge --auto-remove -y curl gnupg \
&& rm -rf /var/lib/apt/lists/*
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
apt-get clean
apt-get -y autoremove
rm -rf \
/var/lib/apt/lists/* \
/root/.npm/ \
/tmp/* \
/var/tmp/* \
/usr/local/src/* \
#
rm -rf /pd_build
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
# And have yarn
npm install -g yarn
......@@ -13,5 +13,9 @@ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys \
E5267A6C \
#
# for msodbcsql17 mssql-tools sqlserv
curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
curl https://packages.microsoft.com/config/ubuntu/18.04/prod.list > /etc/apt/sources.list.d/mssql-release.list
apt-get update
apt-get -y dist-upgrade
......@@ -63,6 +63,19 @@ echo "xdebug.max_nesting_level = 400" >> /etc/php/7.3/mods-available/xdebug.ini
echo "apc.enable_cli=1" >> /etc/php/7.3/mods-available/apcu.ini
echo "apc.slam_defense=0" >> /etc/php/7.3/mods-available/apcu.ini
# mssql driver
ACCEPT_EULA=Y minimal_apt_get_install \
msodbcsql17 \
mssql-tools \
unixodbc-dev \
#
pecl install sqlsrv
pecl install pdo_sqlsrv
echo extension=sqlsrv.so >> /etc/php/7.3/mods-available/sqlsrv.ini
echo extension=pdo_sqlsrv.so >> /etc/php/7.3/mods-available/pdo_sqlsrv.ini
phpenmod sqlsrv
phpenmod pdo_sqlsrv
# Prepare an additional php.ini file that does *NOT* include xdebug
# can be used with: php -n -c /etc/php/cli-no-xdebug/php.ini
mkdir /etc/php/cli-no-xdebug/
......
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