Commit 8eb7e1a0 authored by Christian Kuhn's avatar Christian Kuhn
Browse files

[TASK] Add core v9 compatible js docker image

parent 9074b68a
......@@ -28,6 +28,11 @@ MAJOR_JSCHROME=1
MINOR_JSCHROME=0
PATCHLEVEL_JSCHROME=3
NAME_JSNODE8 = typo3/core-testing-js-node8
MAJOR_JSNODE8=1
MINOR_JSNODE8=0
PATCHLEVEL_JSNODE8=3
NAME_MSSQL2019 = typo3/core-testing-mssql2019
MAJOR_MSSQL2019=1
MINOR_MSSQL2019=0
......@@ -56,6 +61,8 @@ FULLVERSION_JS=$(MAJOR_JS).$(MINOR_JS).$(PATCHLEVEL_JS)
SHORTVERSION_JS=$(MAJOR_JS).$(MINOR_JS)
FULLVERSION_JSCHROME=$(MAJOR_JSCHROME).$(MINOR_JSCHROME).$(PATCHLEVEL_JSCHROME)
SHORTVERSION_JSCHROME=$(MAJOR_JSCHROME).$(MINOR_JSCHROME)
FULLVERSION_JSNODE8=$(MAJOR_JSNODE8).$(MINOR_JSNODE8).$(PATCHLEVEL_JSNODE8)
SHORTVERSION_JSNODE8=$(MAJOR_JSNODE8).$(MINOR_JSNODE8)
FULLVERSION_MSSQL2019=$(MAJOR_MSSQL2019).$(MINOR_MSSQL2019).$(PATCHLEVEL_MSSQL2019)
SHORTVERSION_MSSQL2019=$(MAJOR_MSSQL2019).$(MINOR_MSSQL2019)
FULLVERSION_DOCKER=$(MAJOR_DOCKER).$(MINOR_DOCKER).$(PATCHLEVEL_DOCKER)
......@@ -73,6 +80,7 @@ SHORTVERSION_DOCKERDIND=$(MAJOR_DOCKERDIND).$(MINOR_DOCKERDIND)
build_core_testing_php80 \
build_core_testing_js \
build_core_testing_js_chrome \
build_core_testing_js_node8 \
build_core_testing_mssql2019 \
build_core_testing_docker \
build_core_testing_docker_dind \
......@@ -83,6 +91,7 @@ SHORTVERSION_DOCKERDIND=$(MAJOR_DOCKERDIND).$(MINOR_DOCKERDIND)
release_core_testing_php80 \
release_core_testing_js \
release_core_testing_js_chrome \
release_core_testing_js_node8 \
release_core_testing_mssql2019 \
release_core_testing_docker \
release_core_testing_docker_dind \
......@@ -93,6 +102,7 @@ SHORTVERSION_DOCKERDIND=$(MAJOR_DOCKERDIND).$(MINOR_DOCKERDIND)
clean_images_core_testing_php80 \
clean_images_core_testing_js \
clean_images_core_testing_js_chrome \
clean_images_core_testing_js_node8 \
clean_images_core_testing_mssql2019 \
clean_images_core_testing_docker \
clean_images_core_testing_docker_dind
......@@ -108,6 +118,7 @@ build: \
build_core_testing_php80 \
build_core_testing_js \
build_core_testing_js_chrome \
build_core_testing_js_node8 \
build_core_testing_mssql2019 \
build_core_testing_docker \
build_core_testing_docker_dind
......@@ -119,6 +130,7 @@ release: \
release_core_testing_php80 \
release_core_testing_js \
release_core_testing_js_chrome \
release_core_testing_js_node8 \
release_core_testing_mssql2019 \
release_core_testing_docker \
release_core_testing_docker_dind
......@@ -130,6 +142,7 @@ clean_images: \
clean_images_core_testing_php80 \
clean_images_core_testing_js \
clean_images_core_testing_js_chrome \
clean_images_core_testing_js_node8 \
clean_images_core_testing_mssql2019 \
clean_images_core_testing_docker \
clean_images_core_testing_docker_dind
......@@ -249,6 +262,25 @@ clean_images_core_testing_js_chrome:
docker rmi $(NAME_JSCHROME):$(FULLVERSION_JSCHROME) || true
build_core_testing_js_node8:
docker build -t $(NAME_JSNODE8):$(FULLVERSION_JSNODE8) core-testing-js-node8
docker tag $(NAME_JSNODE8):$(FULLVERSION_JSNODE8) $(NAME_JSNODE8):$(SHORTVERSION_JSNODE8)
release_core_testing_js_node8:
@if ! docker images $(NAME_JSNODE8) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_JSNODE8); then \
echo "$(NAME_JSNODE8) version $(FULLVERSION_JSNODE8) is not yet built. Please run 'make build'"; false; \
fi
docker tag $(NAME_JSNODE8):$(FULLVERSION_JSNODE8) $(NAME_JSNODE8):latest
docker push $(NAME_JSNODE8):latest
docker push $(NAME_JSNODE8):$(FULLVERSION_JSNODE8)
docker push $(NAME_JSNODE8):$(SHORTVERSION_JSNODE8)
clean_images_core_testing_js_node8:
docker rmi $(NAME_JSNODE8):latest || true
docker rmi $(NAME_JSNODE8):$(SHORTVERSION_JSNODE8) || true
docker rmi $(NAME_JSNODE8):$(FULLVERSION_JSNODE8) || true
build_core_testing_mssql2019:
docker build -t $(NAME_MSSQL2019):$(FULLVERSION_MSSQL2019) core-testing-mssql2019
docker tag $(NAME_MSSQL2019):$(FULLVERSION_MSSQL2019) $(NAME_MSSQL2019):$(SHORTVERSION_MSSQL2019)
......
......@@ -40,6 +40,11 @@ which executes karma javascript tests using chrome. Since this image is quite bi
separated from the default `core-testing-js` image to only use it when needed.
### core-testing-js-node8
Similar to the js image above, but with older node versions, used for TYPO3 Core v9 js testing.
### core-testing-mssql2019
While we use the official docker images of mysql, mariadb and postgres for tests that rely
......
FROM node:8
MAINTAINER Christian Kuhn <lolli@schwarzbu.ch>
RUN npm install -g --force yarn
\ 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