Skip to content

Commit 8179501

Browse files
andriyunandriyun
committed
Merge branch 'master' into develop
2 parents 26a876b + 56c700e commit 8179501

File tree

21 files changed

+824
-235
lines changed

21 files changed

+824
-235
lines changed

‎.docker/os2web/Dockerfile

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,17 @@ RUN set -eux; \
77
libxml2-dev \
88
git \
99
wget \
10-
mariadb-client-10.3 \
10+
lsb-release \
11+
gnupg \
1112
cron; \
1213
docker-php-ext-install soap; \
13-
curl -fsSL "https://github.com/drush-ops/drush-launcher/releases/latest/download/drush.phar" -o /usr/local/bin/drush && chmod +x /usr/local/bin/drush
14+
curl -fsSL "https://github.com/drush-ops/drush-launcher/releases/latest/download/drush.phar" -o /usr/local/bin/drush && chmod +x /usr/local/bin/drush; \
15+
# Addind mysql-client
16+
wget https://repo.mysql.com//mysql-apt-config_0.8.13-1_all.deb; \
17+
echo 4 | dpkg -i mysql-apt-config_0.8.13-1_all.deb; \
18+
apt update; \
19+
apt install -qq -y mysql-client; \
20+
echo "[client]" >> /etc/mysql/my.cnf; echo "ssl-mode=DISABLED" >> /etc/mysql/my.cnf
1421

1522
# Removing standard Drupal core and loading OS2Web project.
1623
WORKDIR /opt
@@ -40,14 +47,19 @@ RUN echo '<?php $settings["project_env"] = PROD_ENV; ' > /opt/drupal/web/sites/d
4047
rm -rf /opt/drupal/web/sites/default/files; \
4148
ln -sf /opt/drupal/files /opt/drupal/web/sites/default/files; \
4249
mkdir -p private; \
43-
# Adding syn directory.
50+
# Adding sync directory.
4451
mkdir -p config/sync; \
4552
# Adjusting ownership
46-
chown -R www-data:www-data /opt/drupal/private /opt/drupal/files /opt/drupal/config/sync /opt/drupal/tmp; \
53+
chown -R www-data:www-data /opt/drupal/private /opt/drupal/files /opt/drupal/config/sync /opt/drupal/tmp /opt/drupal/logs; \
4754
chmod g+s -R /opt/drupal/private /opt/drupal/files /opt/drupal/config/sync
4855

4956
# Adding custom apache configuration with PHP value and log settings.
5057
COPY apache/000-default.conf /etc/apache2/sites-enabled/000-default.conf
5158

59+
# Addjusting output channels for access and error log.
60+
RUN ln -sf /dev/stderr /var/log/apache2/error.log; \
61+
ln -sf /dev/stdout /var/log/apache2/access.log; \
62+
ln -sf /dev/stdout /var/log/apache2/other_vhosts_access.log
63+
5264
# Adding Drupal settings.
5365
COPY settings/prod.settings.php /opt/drupal/web/sites/default/

‎.docker/os2web/apache/000-default.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
php_value html_errors 0
2828
php_value display_errors 0
2929
php_admin_value error_reporting 1023
30-
php_value error_log /opt/drupal/logs/php.log
30+
php_value error_log /dev/stderr
3131

3232
php_value session.save_path /opt/drupal/sessions
3333
php_admin_value upload_max_filesize 150

‎.docker/os2web/build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ if [ $# -eq 0 ]; then
77
exit 0
88
fi
99

10+
echo "Updating base image"
11+
docker image pull drupal:8-apache-buster
12+
1013
docker build ./ --build-arg OS2WEB8_TAG=$1 -t dkbellcom/os2web8:$1
1114

1215
if [ "$2" = "--push" ]; then

‎.docksal/commands/db/ballerup

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#!/usr/bin/env bash
2+
# Script Reloads db from server to local environment.
3+
4+
# Trapping CTRL-C
5+
trap ctrl_c INT
6+
trap ctrl_c SIGINT
7+
trap ctrl_c SIGTERM
8+
9+
# Console colors
10+
red='\033[0;31m'
11+
green='\033[0;32m'
12+
green_bg='\033[42m'
13+
yellow='\033[1;33m'
14+
NC='\033[0m'
15+
16+
# Helper functions for console output
17+
echo-red () { echo -e "${red}$1${NC}"; }
18+
echo-green () { echo -e "${green}$1${NC}"; }
19+
echo-green-bg () { echo -e "${green_bg}$1${NC}"; }
20+
echo-yellow () { echo -e "${yellow}$1${NC}"; }
21+
22+
echo-yellow "Reload db from server to local environment."
23+
24+
SSH_CRED=devel7
25+
DB_NAME=ballerup_bellcom_dk
26+
DRUPAL_ROOT=/var/www/ballerup.bellcom.dk/web/sites/default
27+
DRUSH="drush"
28+
29+
echo-yellow "Copying db dump from server"
30+
## @TODO This command only for development phase.
31+
ssh $SSH_CRED "cd ${DRUPAL_ROOT} && drush sql-dump | gzip -9 > ~/${DB_NAME}.sql.gz"
32+
scp $SSH_CRED:$DB_NAME* ./
33+
## To use after release.
34+
#scp $SSH_CRED:/var/lib/mysql_backup/$DB_NAME* ./
35+
36+
echo-yellow "Dropping existing local db"
37+
fin exec "${DRUSH} sql-drop -y"
38+
39+
echo-yellow "Loading downloaded db dump"
40+
fin exec "zcat < ${DB_NAME}.sql.gz | ${DRUSH} sqlc"
41+
## To use after release.
42+
#fin exec "zcat < ${DB_NAME}-cache-structure.sql.gz | ${DRUSH} sqlc"
43+
44+
echo-yellow "Removing db dump"
45+
fin exec "rm ${DB_NAME}.sql.gz"
46+
47+
fin exec "${DRUSH} upwd admin admin"
48+
fin exec "${DRUSH} en stage_file_proxy"
49+
fin exec "${DRUSH} cr"

‎.docksal/commands/db/rebild

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#!/usr/bin/env bash
2+
# Script Reloads db from server to local environment.
3+
4+
# Trapping CTRL-C
5+
trap ctrl_c INT
6+
trap ctrl_c SIGINT
7+
trap ctrl_c SIGTERM
8+
9+
# Console colors
10+
red='\033[0;31m'
11+
green='\033[0;32m'
12+
green_bg='\033[42m'
13+
yellow='\033[1;33m'
14+
NC='\033[0m'
15+
16+
# Helper functions for console output
17+
echo-red () { echo -e "${red}$1${NC}"; }
18+
echo-green () { echo -e "${green}$1${NC}"; }
19+
echo-green-bg () { echo -e "${green_bg}$1${NC}"; }
20+
echo-yellow () { echo -e "${yellow}$1${NC}"; }
21+
22+
echo-yellow "Reload db from server to local environment."
23+
24+
SSH_CRED=rek-web01
25+
DB_NAME=rebild_dk
26+
DRUPAL_ROOT=/var/www/rebild.dk/web/sites/default
27+
DRUSH="drush"
28+
29+
echo-yellow "Copying db dump from server"
30+
## @TODO This command only for development phase.
31+
ssh $SSH_CRED "cd ${DRUPAL_ROOT} && drush sql-dump | gzip -9 > ~/${DB_NAME}.sql.gz"
32+
scp $SSH_CRED:$DB_NAME* ./
33+
## To use after release.
34+
#scp $SSH_CRED:/var/lib/mysql_backup/$DB_NAME* ./
35+
36+
echo-yellow "Dropping existing local db"
37+
fin exec "${DRUSH} sql-drop -y"
38+
39+
echo-yellow "Loading downloaded db dump"
40+
fin exec "zcat < ${DB_NAME}.sql.gz | ${DRUSH} sqlc"
41+
## To use after release.
42+
#fin exec "zcat < ${DB_NAME}-cache-structure.sql.gz | ${DRUSH} sqlc"
43+
44+
echo-yellow "Removing db dump"
45+
fin exec "rm ${DB_NAME}.sql.gz"
46+
47+
fin exec "${DRUSH} upwd admin admin"
48+
fin exec "${DRUSH} en stage_file_proxy"
49+
fin exec "${DRUSH} cr"

‎composer.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,15 @@
5151
"drupal/core": "^8.8.0",
5252
"drupal/core-composer-scaffold": "^8.8.0",
5353
"drupal/fancy_file_delete": "^2.0",
54+
"drupal/gin": "^3.0",
55+
"drupal/gin_login": "^1.0@RC",
5456
"drupal/memcache": "^2.2",
5557
"drupal/monitoring": "^1.9",
58+
"drupal/quick_node_clone": "^1.14",
59+
"drupal/redirect_after_login": "^2.7",
60+
"drupal/siteimprove": "^1.10",
5661
"drupal/stage_file_proxy": "^1.0",
62+
"drupal/workbench": "^1.3",
5763
"drush/drush": "^9.7.1 | ^10.0.0",
5864
"mglaman/drupal-check": "^1.1",
5965
"os2web/os2web": "^1.0",
@@ -136,6 +142,10 @@
136142
"drupal/better_exposed_filters": {
137143
"allow the date format to be set from the bef interface": "https://www.drupal.org/files/issues/2020-12-21/better_exposed_filters_allow_the_date_format-2858610-23_1.patch"
138144
},
145+
"drupal/user_delete_reassign": {
146+
"User to assign this user's content to\" required even when method not selected": "https://www.drupal.org/files/issues/2020-11-20/settings_field_always_required-3183626-3.patch",
147+
"Incorrect user lookup on Bulk deleting": "https://git.drupalcode.org/project/user_delete_reassign/-/commit/05076bbedb66f8471d023894a88b980c2ecdf8d5.patch"
148+
},
139149
"drupal/core": {
140150
"Notice: Undefined index: value in Drupal\\views\\Plugin\\views\\filter\\NumericFilter->acceptExposedInput()" : "https://www.drupal.org/files/issues/2020-06-04/2825860-exposed-filter-notice-38.patch"
141151
}

0 commit comments

Comments
 (0)