Merge remote-tracking branch 'origin/master' into combined-certificates

rage · Dec 19, 2023 · 16ce9ac · 16ce9ac
2 parents 0429016 + c0b4843
commit 16ce9ac
Show file tree

Hide file tree

Showing 288 changed files with 11,175 additions and 8,817 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18
+20
diff --git a/Dockerfile.node.base.dockerfile b/Dockerfile.node.base.dockerfile
@@ -1,4 +1,4 @@
-FROM node:18-bookworm-slim
+FROM node:20-bookworm-slim
 
 RUN apt-get update \
   && apt-get upgrade -yy \

diff --git a/bin/build-dockerfile-node-base b/bin/build-dockerfile-node-base
@@ -8,6 +8,6 @@ RELATIVE_PATH=$(realpath --relative-to="$(pwd)" "$FOLDER_PATH")
 
 run_command cd "$RELATIVE_PATH" || exit
 
-run_command docker pull node:18-bookworm-slim
+run_command docker pull node:20-bookworm-slim
 
 run_command docker build . --file Dockerfile.node.base.dockerfile -t eu.gcr.io/moocfi-public/project-331-node-base
diff --git a/bin/cargo-clippy b/bin/cargo-clippy
@@ -8,4 +8,4 @@ RELATIVE_PATH=$(realpath --relative-to="$(pwd)" "$FOLDER_PATH")
 
 run_command cd "$RELATIVE_PATH" || exit
 
-run_command cargo clippy "$@"
+run_command env SQLX_OFFLINE=1 cargo clippy "$@"
diff --git a/bin/cargo-clippy-fix b/bin/cargo-clippy-fix
@@ -12,4 +12,4 @@ echo -e "${BLUE}Note: please git add all your changes before running this."
 echo -e "That way you can easily see what this command changed with git add -p"
 echo -e "$RESET_EVERYTHING"
 
-run_command cargo clippy --fix --allow-staged "$@"
+run_command env SQLX_OFFLINE=1 cargo clippy --fix --allow-staged "$@"
diff --git a/bin/cargo-doc-open b/bin/cargo-doc-open
@@ -8,4 +8,4 @@ RELATIVE_PATH=$(realpath --relative-to="$(pwd)" "$FOLDER_PATH")
 
 run_command cd "$RELATIVE_PATH" || exit
 
-run_command cargo doc -p headless-lms-server --open --document-private-items "$@"
+run_command env SQLX_OFFLINE=1 cargo doc -p headless-lms-server --open --document-private-items "$@"
diff --git a/bin/system-tests-debug → bin/system-tests-run-tests-debug b/bin/system-tests-debug → bin/system-tests-run-tests-debug
diff --git a/docs/updating-dependencies.md b/docs/updating-dependencies.md
@@ -70,8 +70,7 @@ Compile the system with `bin/dev` and `bin/test`. Try to use the different parts
 
 ## Base image updates
 
-1. Run command: `bin/build-dockerfile-development-base && docker push eu.gcr.io/moocfi-public/project-331-headless-lms-dev-base`
-2. Run command: `bin/build-dockerfile-production-base && docker push eu.gcr.io/moocfi-public/project-331-headless-lms-production-base`
-3. Run command: `bin/build-dockerfile-node-base && docker push eu.gcr.io/moocfi-public/project-331-node-base`
+1. Run command: `bin/build-dockerfile-development-base && docker push eu.gcr.io/moocfi-public/project-331-headless-lms-dev-base && bin/build-dockerfile-production-base && docker push eu.gcr.io/moocfi-public/project-331-headless-lms-production-base`
+2. Run command: `bin/build-dockerfile-node-base && docker push eu.gcr.io/moocfi-public/project-331-node-base`
 
 Run `bin/minikube-pull-images` on your host and instruct others to run this command as well once your update PR is merged.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,4 @@ RELATIVE_PATH=$(realpath --relative-to="$(pwd)" "$FOLDER_PATH")

		run_command cd "$RELATIVE_PATH" \|\| exit

		run_command cargo clippy "$@"
		run_command env SQLX_OFFLINE=1 cargo clippy "$@"