Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions .docksal/commands/db/ballerup
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,14 @@ DRUPAL_ROOT=/var/www/ballerup.bellcom.dk/web/sites/default
DRUSH="drush"

echo-yellow "Copying db dump from server"
## @TODO This command only for development phase.
ssh $SSH_CRED "cd ${DRUPAL_ROOT} && drush sql-dump | gzip -9 > ~/${DB_NAME}.sql.gz"
scp $SSH_CRED:$DB_NAME* ./
## To use after release.
#scp $SSH_CRED:/var/lib/mysql_backup/$DB_NAME* ./
scp $SSH_CRED:/var/lib/mysql_backup/$DB_NAME* ./

echo-yellow "Dropping existing local db"
fin exec "${DRUSH} sql-drop -y"

echo-yellow "Loading downloaded db dump"
fin exec "zcat < ${DB_NAME}.sql.gz | ${DRUSH} sqlc"
## To use after release.
#fin exec "zcat < ${DB_NAME}-cache-structure.sql.gz | ${DRUSH} sqlc"
fin exec "zcat < ${DB_NAME}-cache-structure.sql.gz | ${DRUSH} sqlc"

echo-yellow "Removing db dump"
fin exec "rm ${DB_NAME}.sql.gz"
Expand Down
4 changes: 2 additions & 2 deletions .docksal/docksal.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DOCKSAL_STACK=default
DOCROOT=web
COMPOSER_DEFAULT_VERSION="1"
CLI_IMAGE="docksal/cli:2.11-php7.4"
COMPOSER_DEFAULT_VERSION="2"
CLI_IMAGE="docksal/cli:2.12-php7.4"
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"drupal/core": "^8.8.0",
"drupal/core-composer-scaffold": "^8.8.0",
"drupal/fancy_file_delete": "^2.0",
"drupal/file_management": "^1.0@alpha",
"drupal/gin": "^3.0",
"drupal/gin_login": "^1.0@RC",
"drupal/memcache": "^2.2",
Expand All @@ -78,7 +79,7 @@
"os2web/os2web_news": "dev-master",
"os2web/os2web_pagebuilder": "dev-master",
"os2web/os2web_person_information": "dev-master",
"os2web/os2web_rest_api": "^0.0.1",
"os2web/os2web_rest_api": "0.*",
"os2web/os2web_search": "dev-master",
"os2web/os2web_spotbox": "dev-master",
"vlucas/phpdotenv": "^4.0",
Expand Down
144 changes: 69 additions & 75 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.