|
@@ -9,10 +9,6 @@ variables:
|
|
DOCKER_PWD: 6hd2dLfL
|
|
DOCKER_PWD: 6hd2dLfL
|
|
DOCKER_HOST: tcp://docker:2375
|
|
DOCKER_HOST: tcp://docker:2375
|
|
DOCKER_DRIVER: overlay2
|
|
DOCKER_DRIVER: overlay2
|
|
-
|
|
|
|
-before_script:
|
|
|
|
- - docker info
|
|
|
|
- - docker login -u $DOCKER_USER -p $DOCKER_PWD docker.infra.flowdat.com
|
|
|
|
|
|
|
|
build_branch:
|
|
build_branch:
|
|
image: docker.infra.flowdat.com/fd3/sf-php:latest
|
|
image: docker.infra.flowdat.com/fd3/sf-php:latest
|
|
@@ -30,6 +26,8 @@ build_branch:
|
|
docker_php_sf_70:
|
|
docker_php_sf_70:
|
|
stage: build
|
|
stage: build
|
|
script:
|
|
script:
|
|
|
|
+ - docker info
|
|
|
|
+ - docker login -u $DOCKER_USER -p $DOCKER_PWD docker.infra.flowdat.com
|
|
- docker pull $CONTAINER_IMAGE:latest || true
|
|
- docker pull $CONTAINER_IMAGE:latest || true
|
|
- cd 7_0
|
|
- cd 7_0
|
|
- docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:7.0 --tag $CONTAINER_IMAGE:latest .
|
|
- docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:7.0 --tag $CONTAINER_IMAGE:latest .
|
|
@@ -45,6 +43,8 @@ docker_php_sf_70:
|
|
docker_php_sf_71:
|
|
docker_php_sf_71:
|
|
stage: build
|
|
stage: build
|
|
script:
|
|
script:
|
|
|
|
+ - docker info
|
|
|
|
+ - docker login -u $DOCKER_USER -p $DOCKER_PWD docker.infra.flowdat.com
|
|
- docker pull $CONTAINER_IMAGE:7.1 || true
|
|
- docker pull $CONTAINER_IMAGE:7.1 || true
|
|
- cd 7_1
|
|
- cd 7_1
|
|
- docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:7.1 .
|
|
- docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:7.1 .
|