Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
efbbc37
Global
hjemmesidekongen Dec 22, 2020
7f4b595
RK-276 Added handling for notifications on commenting. Added notifica…
andriyun Dec 23, 2020
bdb559c
Global
hjemmesidekongen Dec 23, 2020
85dc6f8
BKDK-271
hjemmesidekongen Dec 23, 2020
fc3f434
BKDK-271
hjemmesidekongen Dec 23, 2020
e569e08
BKDK-271
hjemmesidekongen Dec 23, 2020
ec29204
BKDK-271
hjemmesidekongen Dec 23, 2020
2f4fb20
BKDK-271
hjemmesidekongen Dec 23, 2020
747bc48
BKDK-271
hjemmesidekongen Dec 23, 2020
d50371d
BKDK-271
hjemmesidekongen Dec 23, 2020
368a33a
BKDK-271
hjemmesidekongen Dec 23, 2020
e986099
BKDK-271
hjemmesidekongen Dec 23, 2020
36305fc
BKDK-271
hjemmesidekongen Dec 23, 2020
d74b5f3
BKDK-320, BKDK-322 os2web_news reference update
stankut Dec 23, 2020
c87459d
BKDK-321 menu linker paragraph display
stankut Dec 23, 2020
0a411c5
BKDK-242 updated os2web_meetings_edoc reference
juuliabellcom Dec 23, 2020
2db5291
Updating os2web_news reference
stankut Dec 23, 2020
9922baa
Disable menu items script
juuliabellcom Dec 23, 2020
dd067ff
Changes in the scripts
Dec 23, 2020
35f247a
Updating os2web_pagebuilder reference
stankut Dec 23, 2020
55bf82c
Add no_stub
juuliabellcom Dec 23, 2020
27aaeaa
BKDK-314
hjemmesidekongen Dec 23, 2020
2925057
Merge branch 'develop' of github.com:OS2web/os2web8 into develop
hjemmesidekongen Dec 23, 2020
eba30c6
BKDK-315
hjemmesidekongen Dec 23, 2020
710704d
BKDK-315
hjemmesidekongen Dec 23, 2020
78ed72f
Added composer downgrade to v1
andriyun Dec 24, 2020
2219d17
Updated composer packages uncompatible with composer 2.0
andriyun Dec 24, 2020
adddbe1
Remove composer version downgrading from travis builds
andriyun Dec 24, 2020
1b0e490
BKDK-325 adding email and phone fields to contact
stankut Dec 28, 2020
ca229b2
Update docksal composer/php v. to match prod.
hjemmesidekongen Dec 28, 2020
07f5a8a
Removing inline pictures that came from migration
stankut Dec 28, 2020
3447b58
Merge branch 'develop' of github.com:OS2web/os2web8 into develop
stankut Dec 28, 2020
b597dfd
Adding meeting node title to a display
stankut Dec 28, 2020
eadbfbc
Updating os2web_meetings reference
stankut Dec 28, 2020
0f610f0
BKDK-326 meetings search form
stankut Dec 30, 2020
d0e05cc
BKDK-326 patching better_exposed_filters
stankut Dec 30, 2020
31598ac
BKDK-242
hjemmesidekongen Jan 4, 2021
e424f47
Merge branch 'develop' of github.com:OS2web/os2web8 into develop
hjemmesidekongen Jan 4, 2021
464914e
BKDK-242
hjemmesidekongen Jan 4, 2021
f5668a8
BKDK-242
hjemmesidekongen Jan 4, 2021
83f4097
BKDK-242
hjemmesidekongen Jan 4, 2021
097a1c2
Hiding sidebar second region if empty
stankut Jan 4, 2021
45a3d28
Merge branch 'composer2' into develop
andriyun Jan 4, 2021
0d4beff
Added composer self-update command to travis build
andriyun Jan 4, 2021
71ce459
Merge branch 'composer2' into develop
andriyun Jan 4, 2021
6f72f2c
Script for fixing nodes publish status
stankut Jan 4, 2021
bb46b44
BKDK-290
hjemmesidekongen Jan 4, 2021
b7b37cb
BKDK-290
hjemmesidekongen Jan 4, 2021
39fb483
BKDK-304
hjemmesidekongen Jan 4, 2021
e41d92f
Revert "Hiding sidebar second region if empty"
hjemmesidekongen Jan 4, 2021
0e69656
Contact
hjemmesidekongen Jan 4, 2021
be8c30a
BKDK-297
hjemmesidekongen Jan 4, 2021
0ad2997
BKDK-297
hjemmesidekongen Jan 4, 2021
b56687b
Buttons
hjemmesidekongen Jan 5, 2021
60138c7
Colourings
hjemmesidekongen Jan 5, 2021
4b6902e
BKDK-330 adding os2web_events block
stankut Jan 6, 2021
7fa378f
BKDK-329
hjemmesidekongen Jan 7, 2021
b15264d
Update ref. to base theme
hjemmesidekongen Jan 7, 2021
decb69f
BKDK-328
hjemmesidekongen Jan 7, 2021
33df93a
BKDK-330
hjemmesidekongen Jan 7, 2021
97043be
BKDK-330
hjemmesidekongen Jan 7, 2021
4c9b332
BKDK-330
hjemmesidekongen Jan 7, 2021
a94d0f6
BKDK-330
hjemmesidekongen Jan 8, 2021
053aebb
BKDK-330
hjemmesidekongen Jan 8, 2021
2eff7b3
BKDK-330
hjemmesidekongen Jan 8, 2021
4522851
BKDK-330
hjemmesidekongen Jan 8, 2021
97591f6
BKDK-328
hjemmesidekongen Jan 8, 2021
809751a
BKDK-330
hjemmesidekongen Jan 8, 2021
6388e96
News
hjemmesidekongen Jan 8, 2021
652b9c4
BKDK-264
hjemmesidekongen Jan 8, 2021
49e2f45
BKDK-330
hjemmesidekongen Jan 8, 2021
ec9e1f8
BKDK-286, BKDK-331 os2web_news reference update
stankut Jan 11, 2021
86da44a
Selfservice links
hjemmesidekongen Jan 11, 2021
eb35746
Merge branch 'develop' of github.com:OS2web/os2web8 into develop
hjemmesidekongen Jan 11, 2021
ad4d262
Selfservice links
hjemmesidekongen Jan 11, 2021
5ef1dc4
BKDK-330
hjemmesidekongen Jan 11, 2021
06e61d9
Update ref. to base theme
hjemmesidekongen Jan 11, 2021
15e3eec
BKDK-289
hjemmesidekongen Jan 11, 2021
8459005
BKDK-313
hjemmesidekongen Jan 11, 2021
de8125c
BKDK-313
hjemmesidekongen Jan 11, 2021
85d231c
BKDK-313 adding page section labels tree
stankut Jan 12, 2021
f22c0a8
BKDK-265 Added docker-compose stack. Drupal has to be run as separate…
andriyun Jan 8, 2021
27f03e3
BKDK-313
hjemmesidekongen Jan 12, 2021
5640c56
BKDK-313
hjemmesidekongen Jan 12, 2021
4564910
BKDK-313
hjemmesidekongen Jan 12, 2021
28a3907
BKDK-313
hjemmesidekongen Jan 12, 2021
79b2e63
BKDK-265 Added liveness page for kubernetes environment.
andriyun Jan 12, 2021
c81f5aa
Moved out install section to separate script. It should be used by ad…
andriyun Jan 13, 2021
bc7faf7
Removed install.sh call from entrypoint.sh. Updated documentation
andriyun Jan 13, 2021
ca330c5
BKDK-313
hjemmesidekongen Jan 13, 2021
9273f57
BKDK-313
hjemmesidekongen Jan 13, 2021
acc4041
Added config directory to docker image
andriyun Jan 13, 2021
8927bd7
Added permission handling steps to docker image
andriyun Jan 13, 2021
2b5acd7
Update os2web_meetings reference
juuliabellcom Jan 13, 2021
7c42a1e
Updated os2web_meetings reference
juuliabellcom Jan 13, 2021
adb04d6
BKDK-331 news teaser display
stankut Jan 14, 2021
47c9515
BKDK-328
hjemmesidekongen Jan 14, 2021
7dfb74c
Merge branch 'develop' of github.com:OS2web/os2web8 into develop
hjemmesidekongen Jan 14, 2021
35e1869
BKDK-326 improving meeting page view
stankut Jan 14, 2021
a07ca6b
BKDK-242 agman enclosure filenames
stankut Jan 14, 2021
dcbe731
BKDK-332
hjemmesidekongen Jan 15, 2021
3e954fc
RK-334
hjemmesidekongen Jan 18, 2021
35ced11
RK-334
hjemmesidekongen Jan 18, 2021
f34cc8a
RK-334
hjemmesidekongen Jan 18, 2021
146e376
Updated os2web_meetings, os2web_meetings_agman references
juuliabellcom Jan 18, 2021
b2ba4cc
Merge branch 'develop' of https://github.com/OS2web/os2web8 into develop
juuliabellcom Jan 18, 2021
acfdca2
Removed entrypoint definition from image. Drupal deployment and provi…
andriyun Jan 19, 2021
e3eada3
Added example for cli container in docker-compose.yaml. This configur…
andriyun Jan 19, 2021
3cf9a4b
Cleanup unused files, documentation
andriyun Jan 19, 2021
342b0af
Removed unused file
andriyun Jan 19, 2021
6591f27
Merge pull request #11 from OS2web/BKDK-265
andriyun Jan 19, 2021
816a84f
RK-332
hjemmesidekongen Jan 20, 2021
94d70e0
BKDK-265 Added SOLR container
andriyun Jan 20, 2021
d2c255d
Merge branch 'master' into develop
stankut Jan 21, 2021
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
Empty file added .docker/mariadb/data/.gitkeep
Empty file.
6 changes: 6 additions & 0 deletions .docker/mariadb/my.cnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# MariaDB database server configuration file.
#
# You can use this file to overwrite the default configuration
#
# For explanations see
# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
49 changes: 49 additions & 0 deletions .docker/os2web/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
FROM drupal:8-apache-buster

# Installing additional dependencies.
RUN set -eux; \
apt update; \
apt install -qq -y \
libxml2-dev \
git \
wget \
mariadb-client-10.3 \
cron; \
docker-php-ext-install soap; \
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

# Removing standard Drupal core and loading OS2Web project.
WORKDIR /opt
# Getting recent state of master branch.
ARG OS2WEB8_TAG
RUN set -eux; \
rm -rf drupal; \
wget https://github.com/OS2web/os2web8/archive/$OS2WEB8_TAG.tar.gz; \
tar -xzvf $OS2WEB8_TAG.tar.gz; \
rm $OS2WEB8_TAG.tar.gz; \
mv os2web8-$OS2WEB8_TAG drupal
WORKDIR /opt/drupal

# Loading composer dependencies and configuring project folders.
RUN set -eux; \
export COMPOSER_HOME="$(mktemp -d)"; \
composer global require hirak/prestissimo;\
COMPOSER_MEMORY_LIMIT=-1 composer install; \
chown -R www-data:www-data web/sites web/modules web/themes; \
# delete composer cache.
rm -rf "$COMPOSER_HOME"

# Adding further site specific data to image.
RUN echo '<?php $settings["project_env"] = PROD_ENV; ' > /opt/drupal/web/sites/default/env.settings.php; \
# Adding files directories.
mkdir -p files; \
rm -rf /opt/drupal/web/sites/default/files; \
ln -sf /opt/drupal/files /opt/drupal/web/sites/default/files; \
mkdir -p private; \
# Adding syn directory.
mkdir -p config/sync; \
# Adjusting ownership
chown -R www-data:www-data /opt/drupal/private /opt/drupal/files /opt/drupal/config/sync; \
chmod g+s -R /opt/drupal/private /opt/drupal/files /opt/drupal/config/sync

COPY settings/prod.settings.php /opt/drupal/web/sites/default/
37 changes: 37 additions & 0 deletions .docker/os2web/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# OS2Web8 docker image

Image based on official [Drupal image](https://hub.docker.com/_/drupal)

Image includes all functional project files inside (PHP code, Composer dependencies).

Drupal content files should be attached as [Volumes](https://docs.docker.com/storage/volumes/) to container:
* public files - `/opt/drupal/files`
* private files - `/opt/drupal/private`

## Environment settings

There are available following environment settings:

### Mysql database
* MYSQL_HOSTNAME - mysql service host name
* MYSQL_DATABASE - mysql service database name
* MYSQL_PORT - mysql service port
* MYSQL_USER - mysql service user
* MYSQL_PASSWORD - mysql service password
* MYSQL_ROOT_PASSWORD - mysql service root password, uses in mysql container

### Drupal
* DRUPAL_HASH_SALT - define drupal hash salt. Uses in `settings.php` file
* OS2WEB_THEME - Drupal theme name for OS2Web project

## Build image

To build image use `build.sh` script with git tag of OS2Web project release as first argument.
NOTE: You should have existing tag for OS2Web project before.

Example:
```
./build.sh [tag-name] --push
```

`--push` - when you this option build will be pushed to docker hub.
25 changes: 25 additions & 0 deletions .docker/os2web/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

if [ $# -eq 0 ]; then
echo "WARNING: There was no tag-name provided!"
echo "Script usage is: './build.sh tag-name'"
echo "Example: './build.sh 1.0.3'"
exit 0
fi

docker build ./ --build-arg OS2WEB8_TAG=$1 -t dkbellcom/os2web8:$1

if [ "$2" = "--push" ]; then
echo "Docker login to dkbellcom. Type password:"
read -s DOCKERHUB_PASS
echo "Authorization..."
echo $DOCKERHUB_PASS | docker login --username dkbellcom --password-stdin

if [ $? -eq 0 ]; then
echo "Pushing image to docker hub ..."
docker push dkbellcom/os2web8:$1
echo "Check your image here https://hub.docker.com/repository/docker/dkbellcom/os2web8/tag"
else
echo "Image is not pushed to docker hub :("
fi;
fi;
Empty file added .docker/os2web/logs/.keep
Empty file.
31 changes: 31 additions & 0 deletions .docker/os2web/settings/prod.settings.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?php
/**
* @file
* Local development override configuration feature.
*
* To activate this feature, copy and rename it such that its path plus
* filename is 'sites/default/settings.local.php'. Then, go to the bottom of
* 'sites/default/settings.php' and uncomment the commented lines that mention
* 'settings.local.php'.
*
* If you are using a site name in the path, such as 'sites/example.com', copy
* this file to 'sites/example.com/settings.local.php', and uncomment the lines
* at the bottom of 'sites/example.com/settings.php'.
*/

$databases['default']['default'] = [
'database' => getenv('MYSQL_DATABASE'),
'driver' => 'mysql',
'host' => getenv('MYSQL_HOSTNAME'),
'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
'password' => getenv('MYSQL_PASSWORD'),
'port' => getenv('MYSQL_PORT'),
'prefix' => '',
'username' => getenv('MYSQL_USER'),
];

$settings['hash_salt'] = getenv('DRUPAL_HASH_SALT');

$settings['file_temp_path'] = '/tmp';
$settings['file_private_path'] = '../private';

164 changes: 164 additions & 0 deletions .docker/solr/config/accents_da.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
# À => A
"\u00C0" => "A"
# Á => A
"\u00C1" => "A"
# Â => A
"\u00C2" => "A"
# Ã => A
"\u00C3" => "A"
# Ä => A
"\u00C4" => "A"
# Å => A
# "\u00C5" => "A"
# Ą => A
"\u0104" => "A"
# Æ => AE
# "\u00C6" => "AE"
# Ç => C
"\u00C7" => "C"
# Ć => C
"\U0106" => "C"
# È => E
"\u00C8" => "E"
# É => E
"\u00C9" => "E"
# Ê => E
"\u00CA" => "E"
# Ë => E
"\u00CB" => "E"
# Ę => E
"\u0118" => "E"
# Ì => I
"\u00CC" => "I"
# Í => I
"\u00CD" => "I"
# Î => I
"\u00CE" => "I"
# Ï => I
"\u00CF" => "I"
# IJ => IJ
"\u0132" => "IJ"
# Ð => D
"\u00D0" => "D"
# Ł => L
"\u0141" => "L"
# Ñ => N
"\u00D1" => "N"
# Ń => N
"\u0143" => "N"
# Ò => O
"\u00D2" => "O"
# Ó => O
"\u00D3" => "O"
# Ô => O
"\u00D4" => "O"
# Õ => O
"\u00D5" => "O"
# Ö => O
"\u00D6" => "O"
# Ø => O
# "\u00D8" => "O"
# Œ => OE
"\u0152" => "OE"
# Þ
"\u00DE" => "TH"
# Ù => U
"\u00D9" => "U"
# Ú => U
"\u00DA" => "U"
# Û => U
"\u00DB" => "U"
# Ü => U
"\u00DC" => "U"
# Ý => Y
"\u00DD" => "Y"
# Ÿ => Y
"\u0178" => "Y"
# à => a
"\u00E0" => "a"
# á => a
"\u00E1" => "a"
# â => a
"\u00E2" => "a"
# ã => a
"\u00E3" => "a"
# ä => a
"\u00E4" => "a"
# å => a
# "\u00E5" => "a"
# æ => ae
# "\u00E6" => "ae"
# ç => c
"\u00E7" => "c"
# è => e
"\u00E8" => "e"
# é => e
"\u00E9" => "e"
# ê => e
"\u00EA" => "e"
# ë => e
"\u00EB" => "e"
# ì => i
"\u00EC" => "i"
# í => i
"\u00ED" => "i"
# î => i
"\u00EE" => "i"
# ï => i
"\u00EF" => "i"
# ij => ij
"\u0133" => "ij"
# ð => d
"\u00F0" => "d"
# ñ => n
"\u00F1" => "n"
# ò => o
"\u00F2" => "o"
# ó => o
"\u00F3" => "o"
# ô => o
"\u00F4" => "o"
# õ => o
"\u00F5" => "o"
# ö => o
"\u00F6" => "o"
# ø => o
# "\u00F8" => "o"
# œ => oe
"\u0153" => "oe"
# ß => ss
"\u00DF" => "ss"
# Ś => S
"\u015a" => "S"
# þ => th
"\u00FE" => "th"
# ù => u
"\u00F9" => "u"
# ú => u
"\u00FA" => "u"
# û => u
"\u00FB" => "u"
# ü => u
"\u00FC" => "u"
# ý => y
"\u00FD" => "y"
# ÿ => y
"\u00FF" => "y"
# Ź => Z
"\u0179" => "Z"
# Ż => Z
"\u017b" => "Z"
# ff => ff
"\uFB00" => "ff"
# fi => fi
"\uFB01" => "fi"
# fl => fl
"\uFB02" => "fl"
# ffi => ffi
"\uFB03" => "ffi"
# ffl => ffl
"\uFB04" => "ffl"
# ſt => st
"\uFB05" => "st"
# st => st
"\uFB06" => "st"
Loading