Skip to content

Commit f6f3863

Browse files
author
DKravtsov
committed
Updated docker docs, docker configs.
1 parent 66fd930 commit f6f3863

File tree

11 files changed

+41
-42
lines changed

11 files changed

+41
-42
lines changed

.dockerignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ _ide_helper.php
1818

1919
### Docker
2020
Dockerfile
21-
docker-compose.yml
22-
docker-compose-test-ci.yml
23-
docker-compose-staging.yml
24-
docker-compose-prod.yml
21+
compose.yaml
22+
compose-test-ci.yaml
23+
compose-staging.yaml
24+
compose-prod.yaml

.gitlab-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ push_staging_images:
5151
stage: deploy
5252
script:
5353
- make build-staging
54-
# TODO: set necessary image name in docker-compose-staging.yml according to your registry and edit lines bellow
54+
# TODO: set necessary image name in compose-staging.yaml according to your registry and edit lines bellow
5555
#- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
56-
#- docker-compose -f docker-compose-staging.yml push
56+
#- docker compose -f compose-staging.yaml push
5757
only:
5858
- master
5959
- develop
@@ -63,9 +63,9 @@ push_prod_images:
6363
stage: deploy
6464
script:
6565
- make build-prod
66-
# TODO: set necessary image name in docker-compose-prod.yml according to your registry and edit lines bellow
66+
# TODO: set necessary image name in compose-prod.yaml according to your registry and edit lines bellow
6767
#- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
68-
#- docker-compose -f docker-compose-prod.yml push
68+
#- docker compose -f compose-prod.yaml push
6969
only:
7070
- master
7171
- /^release.*$/

.idea/php.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/phpunit.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARG INSIDE_DOCKER_CONTAINER=1
1111
ENV INSIDE_DOCKER_CONTAINER=$INSIDE_DOCKER_CONTAINER
1212
ARG XDEBUG_CONFIG=main
1313
ENV XDEBUG_CONFIG=$XDEBUG_CONFIG
14-
ARG XDEBUG_VERSION=3.3.1
14+
ARG XDEBUG_VERSION=3.3.2
1515
ENV XDEBUG_VERSION=$XDEBUG_VERSION
1616

1717
# check environment

Makefile

Lines changed: 24 additions & 24 deletions
Large diffs are not rendered by default.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)