Skip to content

Commit

Permalink
Remove version: from docker-compose.yml: docker/compose#11628
Browse files Browse the repository at this point in the history
  • Loading branch information
rbouma2 committed May 6, 2024
1 parent 87492ee commit 78d23f7
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 12 deletions.
1 change: 0 additions & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.9"
services:
traefik:
container_name: traefik
Expand Down
1 change: 0 additions & 1 deletion docker/portainer-service.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.9"
services:
portainer:
container_name: portainer
Expand Down
1 change: 0 additions & 1 deletion docker/startpage-service.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.9"
services:
startpage:
container_name: startpage
Expand Down
2 changes: 0 additions & 2 deletions docs/configuration/multipledomains.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Multiple top-level domains may also be setup by following the instructions below
2. Create a `.roll/roll-env.yml` file with the contents below (this will be additive to the docker-compose config RollDev uses for the env, anything added here will be merged in, and you can see the complete config using `roll env config`):

```yaml
version: "3.9"
services:
varnish:
labels:
Expand Down Expand Up @@ -43,7 +42,6 @@ Multiple top-level domains may also be setup by following the instructions below
:::

```yaml
version: "3.9"
services:
php-fpm:
extra_hosts:
Expand Down
3 changes: 0 additions & 3 deletions docs/environments/customizing.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ One example for a use case is {doc}`the setup of multiple domains <../configurat

If that's not enough, it's possible to extend the environment config by leveraging, like for example (`.roll/environments/magento2/magento2.base.yml`):
```
version: "3.9"
services:
nginx:
image: my_custom_nginx_image:latest
Expand All @@ -47,7 +46,6 @@ To override default php settings, follow the docker customization above and incl
In this case the `roll-env.yml` should look like this:

```
version: "3.9"
services:
php-fpm:
volumes:
Expand Down Expand Up @@ -77,7 +75,6 @@ upload_max_filesize = 25M
To override the default nginx configuration of your project, add a new file
`.roll/roll-env.yml` to your project root with the following content:
```
version: "3.9"
services:
nginx:
volumes:
Expand Down
2 changes: 0 additions & 2 deletions environments/magento2/magento2.magepack.darwin.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.5"

x-volumes: &volumes
- .${ROLL_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:cached
- appdata:/var/www/html
Expand Down
2 changes: 0 additions & 2 deletions environments/magento2/magento2.magepack.linux.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.5"

x-volumes: &volumes
- .${ROLL_WEB_ROOT:-}/:/var/www/html

Expand Down

0 comments on commit 78d23f7

Please sign in to comment.