Skip to content

Commit bc7faf7

Browse files
committed
Removed install.sh call from entrypoint.sh. Updated documentation
1 parent c81f5aa commit bc7faf7

File tree

3 files changed

+25
-6
lines changed

3 files changed

+25
-6
lines changed

.docker/os2web/README.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ There are available following environment settings:
2929
* WAIT_ON_MYSQL - flag is used to set delay for getting MYSQL service ready
3030
* PRINT_STATUS - Runs "drush status" command
3131
* DEPLOYMENT - Runs deployment action: drush updb, drush cr etc
32-
* INSTALL_OS2WEB - Runs installation process. **WARNING:** It will drop existing database and reinstall Drupal.
3332

3433
## Build image
3534

@@ -42,3 +41,27 @@ Example:
4241
```
4342

4443
`--push` - when you this option build will be pushed to docker hub.
44+
45+
## Install Drupal
46+
47+
In case you need to install OS2Web through docker image on new environment,
48+
it should happen as separate deployment procedure with special docker image
49+
settings.
50+
51+
* Checkout repository to separate branch `[recent-git-tag]-install`
52+
* Add `source /install.sh` call above deployment section.
53+
* Commit changes and create additional release tag `[recent-git-tag]-install`.
54+
So your tag, for example, will look like `0.0.2-install`
55+
56+
```
57+
....
58+
# Drupal installation step
59+
source /install.sh
60+
61+
if [ "$DEPLOYMENT" = true ]; then
62+
echo "Running deployment"
63+
.....
64+
65+
```
66+
67+
See detailed steps for install procedure `.docker/os2web/install.sh`

.docker/os2web/entrypoint.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ if [ "$PRINT_STATUS" = true ]; then
1010
$DRUSH status
1111
fi;
1212

13-
source /install.sh
14-
1513
if [ "$DEPLOYMENT" = true ]; then
1614
echo "Running deployment"
1715
export DRUSH="drush --root=/opt/drupal"

docker-compose.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ volumes:
1313
services:
1414

1515
php:
16-
image: dkbellcom/os2web8:0.0.1
16+
image: dkbellcom/os2web8:0.0.2
1717
container_name: php
1818
volumes:
1919
# - ./:/opt/drupal
@@ -45,8 +45,6 @@ services:
4545
- PRINT_STATUS=true
4646
# Runs deployment action: drush updb, drush cr etc.
4747
- DEPLOYMENT=true
48-
# WARNING: It will drop existing database and reinstall Drupal.
49-
- INSTALL_OS2WEB=true
5048

5149
mariadb:
5250
image: mariadb:latest

0 commit comments

Comments
 (0)