Merge pull request #1022 from bcc-code/develop

Develop -> Master (Upgade Directus)
bcc-code · Oct 10, 2024 · 5b80a5e · 5b80a5e
2 parents f00e826 + 233d795
commit 5b80a5e
Show file tree

Hide file tree

Showing 82 changed files with 29,324 additions and 23,878 deletions.
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
@@ -24,9 +24,9 @@ blocks:
             - make install
             - cache store node-$(checksum pnpm-lock.yaml) $(pnpm store path)
             - make build
-            - 'docker build -t "europe-west4-docker.pkg.dev/utils-332514/btv-platform/cms:${SEMAPHORE_GIT_SHA:0:7}" -t europe-west4-docker.pkg.dev/utils-332514/btv-platform/cms:$SEMAPHORE_GIT_BRANCH .'
+            - 'docker build -t "europe-west4-docker.pkg.dev/utils-332514/btv-platform/cms:${SEMAPHORE_GIT_SHA:0:7}" -t europe-west4-docker.pkg.dev/utils-332514/btv-platform/cms:${SEMAPHORE_GIT_BRANCH//\//_} .'
             - 'docker push "europe-west4-docker.pkg.dev/utils-332514/btv-platform/cms:${SEMAPHORE_GIT_SHA:0:7}" '
-            - "docker push europe-west4-docker.pkg.dev/utils-332514/btv-platform/cms:$SEMAPHORE_GIT_BRANCH"
+            - "docker push europe-west4-docker.pkg.dev/utils-332514/btv-platform/cms:${SEMAPHORE_GIT_BRANCH//\\//_}"
             - 'echo "europe-west4-docker.pkg.dev/utils-332514/btv-platform/cms:${SEMAPHORE_GIT_SHA:0:7}" > cms.txt'
             - artifact push workflow cms.txt
       prologue:
@@ -58,33 +58,33 @@ blocks:
             - cp version.json ./backend
             - CGO_ENABLED=0 go build -v -o ./backend/bin ./backend/cmd/api
             - cd ./backend
-            - 'docker build -t "europe-west4-docker.pkg.dev/utils-332514/btv-platform/api:${SEMAPHORE_GIT_SHA:0:7}" -t europe-west4-docker.pkg.dev/utils-332514/btv-platform/api:$SEMAPHORE_GIT_BRANCH .'
+            - 'docker build -t "europe-west4-docker.pkg.dev/utils-332514/btv-platform/api:${SEMAPHORE_GIT_SHA:0:7}" -t europe-west4-docker.pkg.dev/utils-332514/btv-platform/api:${SEMAPHORE_GIT_BRANCH//\//_} .'
             - 'docker push "europe-west4-docker.pkg.dev/utils-332514/btv-platform/api:${SEMAPHORE_GIT_SHA:0:7}"'
-            - "docker push europe-west4-docker.pkg.dev/utils-332514/btv-platform/api:$SEMAPHORE_GIT_BRANCH"
+            - "docker push europe-west4-docker.pkg.dev/utils-332514/btv-platform/api:${SEMAPHORE_GIT_BRANCH//\\//_}"
             - 'echo "europe-west4-docker.pkg.dev/utils-332514/btv-platform/api:${SEMAPHORE_GIT_SHA:0:7}" > api.txt'
             - artifact push workflow api.txt
             - cd ..
             - CGO_ENABLED=0 go build -v -o ./backend/bin ./backend/cmd/jobs
             - cd ./backend
-            - 'docker build -t "europe-west4-docker.pkg.dev/utils-332514/btv-platform/jobs:${SEMAPHORE_GIT_SHA:0:7}" -t europe-west4-docker.pkg.dev/utils-332514/btv-platform/jobs:$SEMAPHORE_GIT_BRANCH .'
+            - 'docker build -t "europe-west4-docker.pkg.dev/utils-332514/btv-platform/jobs:${SEMAPHORE_GIT_SHA:0:7}" -t europe-west4-docker.pkg.dev/utils-332514/btv-platform/jobs:${SEMAPHORE_GIT_BRANCH//\//_} .'
             - 'docker push "europe-west4-docker.pkg.dev/utils-332514/btv-platform/jobs:${SEMAPHORE_GIT_SHA:0:7}"'
-            - "docker push europe-west4-docker.pkg.dev/utils-332514/btv-platform/jobs:$SEMAPHORE_GIT_BRANCH"
+            - "docker push europe-west4-docker.pkg.dev/utils-332514/btv-platform/jobs:${SEMAPHORE_GIT_BRANCH//\\//_}"
             - 'echo "europe-west4-docker.pkg.dev/utils-332514/btv-platform/jobs:${SEMAPHORE_GIT_SHA:0:7}" > jobs.txt'
             - artifact push workflow jobs.txt
             - cd ..
             - CGO_ENABLED=0 go build -v -o ./backend/bin ./backend/cmd/rewriter
             - cd ./backend
-            - 'docker build -t "europe-west4-docker.pkg.dev/utils-332514/btv-platform/rewriter:${SEMAPHORE_GIT_SHA:0:7}" -t europe-west4-docker.pkg.dev/utils-332514/btv-platform/rewriter:$SEMAPHORE_GIT_BRANCH .'
+            - 'docker build -t "europe-west4-docker.pkg.dev/utils-332514/btv-platform/rewriter:${SEMAPHORE_GIT_SHA:0:7}" -t europe-west4-docker.pkg.dev/utils-332514/btv-platform/rewriter:${SEMAPHORE_GIT_BRANCH//\//_} .'
             - 'docker push "europe-west4-docker.pkg.dev/utils-332514/btv-platform/rewriter:${SEMAPHORE_GIT_SHA:0:7}"'
-            - "docker push europe-west4-docker.pkg.dev/utils-332514/btv-platform/rewriter:$SEMAPHORE_GIT_BRANCH"
+            - "docker push europe-west4-docker.pkg.dev/utils-332514/btv-platform/rewriter:${SEMAPHORE_GIT_BRANCH//\\//_}"
             - 'echo "europe-west4-docker.pkg.dev/utils-332514/btv-platform/rewriter:${SEMAPHORE_GIT_SHA:0:7}" > rewriter.txt'
             - artifact push workflow rewriter.txt
             - cd ..
             - CGO_ENABLED=0 go build -v -o ./backend/bin ./backend/cmd/videomanipulator
             - cd ./backend
-            - 'docker build -f Dockerfile.ffmpeg -t "europe-west4-docker.pkg.dev/utils-332514/btv-platform/videomanipulator:${SEMAPHORE_GIT_SHA:0:7}" -t europe-west4-docker.pkg.dev/utils-332514/btv-platform/videomanipulator:$SEMAPHORE_GIT_BRANCH .'
+            - 'docker build -f Dockerfile.ffmpeg -t "europe-west4-docker.pkg.dev/utils-332514/btv-platform/videomanipulator:${SEMAPHORE_GIT_SHA:0:7}" -t europe-west4-docker.pkg.dev/utils-332514/btv-platform/videomanipulator:${SEMAPHORE_GIT_BRANCH//\//_} .'
             - 'docker push "europe-west4-docker.pkg.dev/utils-332514/btv-platform/videomanipulator:${SEMAPHORE_GIT_SHA:0:7}"'
-            - "docker push europe-west4-docker.pkg.dev/utils-332514/btv-platform/videomanipulator:$SEMAPHORE_GIT_BRANCH"
+            - "docker push europe-west4-docker.pkg.dev/utils-332514/btv-platform/videomanipulator:${SEMAPHORE_GIT_BRANCH//\\//_}"
             - 'echo "europe-west4-docker.pkg.dev/utils-332514/btv-platform/videomanipulator:${SEMAPHORE_GIT_SHA:0:7}" > videomanipulator.txt'
             - artifact push workflow videomanipulator.txt
       secrets:
@@ -100,9 +100,9 @@ blocks:
             - scripts/gen-version.sh
             - cp version.json ./migrations
             - cd migrations
-            - 'docker build -t "europe-west4-docker.pkg.dev/utils-332514/btv-platform/migrations:${SEMAPHORE_GIT_SHA:0:7}" -t europe-west4-docker.pkg.dev/utils-332514/btv-platform/migrations:$SEMAPHORE_GIT_BRANCH .'
+            - 'docker build -t "europe-west4-docker.pkg.dev/utils-332514/btv-platform/migrations:${SEMAPHORE_GIT_SHA:0:7}" -t europe-west4-docker.pkg.dev/utils-332514/btv-platform/migrations:${SEMAPHORE_GIT_BRANCH//\//_} .'
             - 'docker push "europe-west4-docker.pkg.dev/utils-332514/btv-platform/migrations:${SEMAPHORE_GIT_SHA:0:7}" '
-            - "docker push europe-west4-docker.pkg.dev/utils-332514/btv-platform/migrations:$SEMAPHORE_GIT_BRANCH"
+            - "docker push europe-west4-docker.pkg.dev/utils-332514/btv-platform/migrations:${SEMAPHORE_GIT_BRANCH//\\//_}"
             - 'echo "europe-west4-docker.pkg.dev/utils-332514/btv-platform/migrations:${SEMAPHORE_GIT_SHA:0:7}"  > migrations.txt'
             - artifact push workflow migrations.txt
       secrets:

diff --git a/Makefile b/Makefile
@@ -14,6 +14,7 @@ init:
 	cd ./cms && make init
 
 diff:
+	@if [ -z "${name}" ]; then echo "Add a name with make diff name=migration_name_here"; exit 1; fi
 	./scripts/db_diff.sh $(name)
 	cd ./backend && make ./sqlc/.generated
 

diff --git a/backend/sqlc/directus-files.sql.go b/backend/sqlc/directus-files.sql.go
diff --git a/backend/sqlc/models.go b/backend/sqlc/models.go
diff --git a/cms/.gitignore b/cms/.gitignore
@@ -6,6 +6,6 @@ node_modules
 uploads
 .env
 
-extensions
+dist
 
 .vscode
diff --git a/packages/directus-modules/.prettierrc → cms/.prettierrc b/packages/directus-modules/.prettierrc → cms/.prettierrc
diff --git a/cms/Dockerfile b/cms/Dockerfile
@@ -1,6 +1,6 @@
 FROM gcr.io/cloudsql-docker/gce-proxy:1.30.1 AS sqlproxy
 
-FROM directus/directus:10.7.2 AS prod
+FROM directus/directus:11.1.0 AS prod
 COPY --from=sqlproxy /cloud_sql_proxy /cloud_sql_proxy
 WORKDIR /directus
 COPY ./extensions /directus/extensions/
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,6 @@ node_modules @@
     uploads
     .env
-    extensions
+    dist
     .vscode