Skip to content

Commit 02e2a0f

Browse files
tujtuj
committed
3197: Changed to load tagged template release
1 parent 4b25dd5 commit 02e2a0f

File tree

4 files changed

+69
-32
lines changed

4 files changed

+69
-32
lines changed

‎README.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
11
# OS2display docker server hosting
22

33
Basic docker based hosting setup for OS2display v.2
4+
5+
## Deployment
6+
7+
### Containers
8+
9+
Change the tags in .env.docker.local to the tags of the containers you wish to deploy.
10+
11+
E.g.
12+
13+
```dotenv
14+
COMPOSE_VERSION_API=2.0.0
15+
COMPOSE_VERSION_ADMIN=2.0.0
16+
COMPOSE_VERSION_CLIENT=2.0.0
17+
```
18+
19+
### Templates
20+
21+
Import templates and screen layouts:
22+
23+
#### Production
24+
25+
In production run the script `load-templates-prod.sh` with the TEMPLATES_RELEASE environment variable set to the tag of
26+
the templates to load.
27+
28+
E.g.
29+
30+
```shell
31+
TEMPLATES_RELEASE=2.1.0 ./load-templates-prod.sh
32+
```
33+
34+
#### Staging
35+
36+
In staging run the script

restart-develop.sh renamed to load-templates-develop.sh

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
11
#!/bin/sh
22

3-
docker compose --env-file .env.docker.local -f docker-compose.server.yml pull
4-
docker compose --env-file .env.docker.local -f docker-compose.server.yml up --force-recreate --detach --remove-orphans
5-
6-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console doctrine:migrations:migrate --no-interaction
7-
83
# app:template:load
9-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review-config-develop.json
10-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-config-develop.json
11-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/develop/build/contacts-config-develop.json
12-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/develop/build/iframe-config-develop.json
13-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-config-develop.json
14-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed-config-develop.json
15-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-config-develop.json
16-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss-config-develop.json
17-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow-config-develop.json
18-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/develop/build/table-config-develop.json
19-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/develop/build/travel-config-develop.json
20-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/develop/build/video-config-develop.json
4+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p -t https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review-config-develop.json
5+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p -t https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-config-develop.json
6+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p -t https://raw.githubusercontent.com/os2display/display-templates/develop/build/contacts-config-develop.json
7+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p -t https://raw.githubusercontent.com/os2display/display-templates/develop/build/iframe-config-develop.json
8+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p -t https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-config-develop.json
9+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p -t https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed-config-develop.json
10+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p -t https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-config-develop.json
11+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p -t https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss-config-develop.json
12+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p -t https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow-config-develop.json
13+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p -t https://raw.githubusercontent.com/os2display/display-templates/develop/build/table-config-develop.json
14+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p -t https://raw.githubusercontent.com/os2display/display-templates/develop/build/travel-config-develop.json
15+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p -t https://raw.githubusercontent.com/os2display/display-templates/develop/build/video-config-develop.json
2116

2217
# app:screen-layouts:load
2318
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:screen-layouts:load --update --cleanup-regions https://raw.githubusercontent.com/os2display/display-templates/develop/src/screen-layouts/full-screen.json

restart-prod.sh renamed to load-templates-prod.sh

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
#!/bin/sh
22

3-
docker compose --env-file .env.docker.local -f docker-compose.server.yml pull
4-
docker compose --env-file .env.docker.local -f docker-compose.server.yml up --force-recreate --detach --remove-orphans
3+
if [ -z "${TEMPLATES_RELEASE}" ]
4+
then
5+
echo "TEMPLATES_RELEASE must be set to a valid tag."
6+
exit 2
7+
fi
58

6-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console doctrine:migrations:migrate --no-interaction
9+
echo "Loading templates with tag: ${TEMPLATES_RELEASE}."
710

811
# app:template:load
9-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review-config-main.json
10-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar-config-main.json
11-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/main/build/contacts-config-main.json
12-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/main/build/iframe-config-main.json
13-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-config-main.json
14-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed-config-main.json
15-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/main/build/poster-config-main.json
16-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/main/build/rss-config-main.json
17-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/main/build/slideshow-config-main.json
18-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/main/build/table-config-main.json
19-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/main/build/travel-config-main.json
20-
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load https://raw.githubusercontent.com/os2display/display-templates/main/build/video-config-main.json
12+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p https://raw.githubusercontent.com/os2display/display-templates/refs/tags/${TEMPLATES_RELEASE}/build/book-review-config-main.json
13+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p https://raw.githubusercontent.com/os2display/display-templates/refs/tags/${TEMPLATES_RELEASE}/build/calendar-config-main.json
14+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p https://raw.githubusercontent.com/os2display/display-templates/refs/tags/${TEMPLATES_RELEASE}/build/contacts-config-main.json
15+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p https://raw.githubusercontent.com/os2display/display-templates/refs/tags/${TEMPLATES_RELEASE}/build/iframe-config-main.json
16+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p https://raw.githubusercontent.com/os2display/display-templates/refs/tags/${TEMPLATES_RELEASE}/build/image-text-config-main.json
17+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p https://raw.githubusercontent.com/os2display/display-templates/refs/tags/${TEMPLATES_RELEASE}/build/instagram-feed-config-main.json
18+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p https://raw.githubusercontent.com/os2display/display-templates/refs/tags/${TEMPLATES_RELEASE}/build/poster-config-main.json
19+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p https://raw.githubusercontent.com/os2display/display-templates/refs/tags/${TEMPLATES_RELEASE}/build/rss-config-main.json
20+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p https://raw.githubusercontent.com/os2display/display-templates/refs/tags/${TEMPLATES_RELEASE}/build/slideshow-config-main.json
21+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p https://raw.githubusercontent.com/os2display/display-templates/refs/tags/${TEMPLATES_RELEASE}/build/table-config-main.json
22+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p https://raw.githubusercontent.com/os2display/display-templates/refs/tags/${TEMPLATES_RELEASE}/build/travel-config-main.json
23+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:template:load -p https://raw.githubusercontent.com/os2display/display-templates/refs/tags/${TEMPLATES_RELEASE}/build/video-config-main.json
2124

2225
# app:screen-layouts:load
2326
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console app:screen-layouts:load --update --cleanup-regions https://raw.githubusercontent.com/os2display/display-templates/main/src/screen-layouts/full-screen.json

‎restart.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
3+
docker compose --env-file .env.docker.local -f docker-compose.server.yml pull
4+
docker compose --env-file .env.docker.local -f docker-compose.server.yml up --force-recreate --detach --remove-orphans
5+
6+
docker compose --env-file .env.docker.local -f docker-compose.server.yml exec --user deploy api bin/console doctrine:migrations:migrate --no-interaction

0 commit comments

Comments
 (0)