Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5c5d5a3

Browse files
author
DKravtsov
committed
Updated docker docs, docker configs.
1 parent 5fb1d35 commit 5c5d5a3

File tree

8 files changed

+37
-39
lines changed

8 files changed

+37
-39
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+
#- dockercompose -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+
#- dockercompose -f compose-prod.yaml push
6969
only:
7070
- master
7171
- /^release.*$/

‎Makefile

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

‎readme.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Docker environment required to run Laravel (based on official php and mysql dock
1111
[Source code](https://github.com/systemsdk/docker-apache-php-laravel.git)
1212

1313
## Requirements
14-
* Docker version 18.06 or later
15-
* Docker compose version 1.22 or later
14+
* Docker Engine version 18.06 or later
15+
* Docker Compose version 1.22 or later
1616
* An editor or IDE
1717
* MySQL Workbench
1818

@@ -25,12 +25,10 @@ Note: OS recommendation - Linux Ubuntu based.
2525
4. Laravel 11
2626
5. Mailpit (only for debug emails on dev environment)
2727

28-
## Setting up Docker and docker-compose
29-
1.For installing Docker please follow steps mentioned on page [install on Ubuntu linux](https://docs.docker.com/install/linux/docker-ce/ubuntu/) or [install on Mac/Windows](https://docs.docker.com/engine/install/).
28+
## Setting up Docker Engine with Docker Compose
29+
For installing Docker Engine with docker compose please follow steps mentioned on page [Docker Engine](https://docs.docker.com/engine/install/).
3030

31-
2.For installing docker-compose as `Linux Standalone binary` please follow steps on the page [install compose](https://docs.docker.com/compose/install/standalone/) if you are using Linux OS.
32-
33-
Note 1: Please run next cmd after above step 2 if you are using Linux OS: `sudo usermod -aG docker $USER`
31+
Note 1: Please run next cmd after above step if you are using Linux OS: `sudo usermod -aG docker $USER`
3432

3533
Note 2: If you are using Docker Desktop for MacOS 12.2 or later - please enable [virtiofs](https://www.docker.com/blog/speed-boost-achievement-unlocked-on-docker-desktop-4-6-for-mac/) for performance (enabled by default since Docker Desktop v4.22).
3634

@@ -123,7 +121,7 @@ If you have installed composer and want to install environment via composer you
123121
composer create-project systemsdk/docker-apache-php-laravel example-app
124122
```
125123

126-
2.Edit `docker-compose-prod.yml` and set necessary user/password for MySQL.
124+
2.Edit `compose-prod.yaml` and set necessary user/password for MySQL.
127125

128126
3.Edit `env.prod` and set necessary user/password for MySQL.
129127

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /