Skip to content
This repository has been archived by the owner on Sep 3, 2024. It is now read-only.

BC-6724 - fix horizontal scrollbar #71

Merged
merged 8 commits into from
Jun 17, 2024
Merged

BC-6724 - fix horizontal scrollbar #71

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
319a720
BC-6724 added feature flag for new sidemenu
UzaeirKhan Jun 4, 2024
62b5da9
BC-6724 corrected formatting issue
UzaeirKhan Jun 4, 2024
b00f481
formatting
odalys-dataport Jun 5, 2024
4dca415
undo formatting changes
odalys-dataport Jun 13, 2024
45ac8f0
add missing quotation mark
odalys-dataport Jun 14, 2024
743081e
Merge branch 'main' into BC-6724-fix-scrollbar
odalys-dataport Jun 14, 2024
a1a62fe
save without formatting
odalys-dataport Jun 14, 2024
ad61d97
Merge branch 'BC-6724-fix-scrollbar' of https://github.com/hpi-schul-…
odalys-dataport Jun 14, 2024
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
14 changes: 8 additions & 6 deletions compose-files/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
version: "3.2"

services:


### nginx
#nginx:
# image: nginx
Expand Down Expand Up @@ -64,7 +62,7 @@ services:
volumes:
- ../scripts/mongo_setup.sh:/scripts/mongo_setup.sh
restart: "no"
entrypoint: [ "bash", "/scripts/mongo_setup.sh" ]
entrypoint: ["bash", "/scripts/mongo_setup.sh"]
mamutmk5 marked this conversation as resolved.
Show resolved Hide resolved

redis:
image: redis:${REDIS_DOCKER_TAG:-latest} ## change tag in version.env
Expand All @@ -89,8 +87,8 @@ services:
ports:
- "5432:5432"
volumes:
- 'data-calendar-postgres:/var/lib/postgresql/data'
- 'postgres-init:/docker-entrypoint-initdb.d'
- "data-calendar-postgres:/var/lib/postgresql/data"
- "postgres-init:/docker-entrypoint-initdb.d"
mamutmk5 marked this conversation as resolved.
Show resolved Hide resolved
environment:
- POSTGRES_DB=schulcloud_calendar
- POSTGRES_USER=node
Expand Down Expand Up @@ -145,6 +143,8 @@ services:
- FILES_STORAGE__S3_REGION=eu-central-1
- CLAMAV__SERVICE_HOSTNAME=localhost
- CLAMAV__SERVICE_PORT=3310
# ENV for new side menu
- FEATURE_NEW_LAYOUT_ENABLED=true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alternative, add this flag in server and legacy client in config/test.json

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or make it the default...

# URIs and Port
- DB_URL=mongodb://mongodb-primary:27017,mongodb-secondary:27017,mongodb-arbiter:27017/schulcloud?replicaSet=rs0&tls=false
- REDIS_URI=redis://redis:6379
Expand Down Expand Up @@ -262,6 +262,8 @@ services:
- SC_FEDERALSTATE=mainstate
- CALENDAR_SERVICE_ENABLED=true
- REDIS_URI=redis://redis:6379
# ENV for new side menu
- FEATURE_NEW_LAYOUT_ENABLED=true
# Google
#- GOOGLE_ANALYTICS_TRACKING_ID="UA-155982548-1"
# URIs
Expand Down Expand Up @@ -340,7 +342,7 @@ services:
dockerfile: Dockerfile
init: true
volumes:
- 'postgres-init:/docker-entrypoint-initdb.d'
- "postgres-init:/docker-entrypoint-initdb.d"
mamutmk5 marked this conversation as resolved.
Show resolved Hide resolved
command: /bin/sh -c 'cp schema.sql /docker-entrypoint-initdb.d/01-schema.sql && cp example_data.sql /docker-entrypoint-initdb.d/02-data.sql'

selenium-hub:
Expand Down
Loading