Merge remote-tracking branch 'origin/develop' into berta

ILSCeV · Dec 3, 2023 · 9e5013c · 9e5013c
2 parents 33974d6 + 2579b7e
commit 9e5013c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
-FROM mcr.microsoft.com/devcontainers/php:1-8-bookworm
-COPY --from=composer /usr/bin/composer /usr/bin/composer
+FROM mcr.microsoft.com/devcontainers/php:1-8-bookworm@sha256:a2b778ac4116c0b037caef0e35d1c703bb86924972859befc91a67e04a11ed67
+COPY --from=composer@sha256:67f1bec07666f688791bff2c13b34b9c35042cc4c1e42fbb5bd4dbe4ae70f0fb /usr/bin/composer /usr/bin/composer
 RUN docker-php-ext-install -j$(nproc) mysqli
 RUN docker-php-ext-install -j$(nproc) pdo
 RUN docker-php-ext-install -j$(nproc) pdo_mysql

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -19,7 +19,7 @@ services:
     # (Adding the "ports" property to this file will not forward from a Codespace.)
 
   db:
-    image: mariadb:10.4
+    image: mariadb:10.4@sha256:49ff74fc352895fa9026bd53e86d16df9b80312b0f56f3d6f9414cead8cca438
     restart: unless-stopped
     volumes:
       - mariadb-data:/var/lib/mysql

diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,13 @@
-FROM node:20-alpine@sha256:cb2301e2c5fe3165ba2616591efe53b4b6223849ac0871c138f56d5f7ae8be4b as node
+FROM node:20-alpine@sha256:32427bc0620132b2d9e79e405a1b27944d992501a20417a7f407427cc4c2b672 as node
 COPY ./ /Lara
 RUN cd /Lara && npm install && npm run prod
 
 FROM docker.io/bitnami/git:latest@sha256:1963a626c532c6af0988cb854edacece84a6ad53c1a8c957c022ada8ab9580f6 as gitstage
 COPY --from=node /Lara /Lara
 RUN cd /Lara && sh git-create-revisioninfo-hook.sh
 
-FROM php:8.2.12-fpm@sha256:2aa938b6d62f7415e9c84d867d9ceed18ef8ec3cf3944d389e088c93f9678a84
-COPY --from=composer@sha256:fb3c5a283f2dc08e08841048498e8a82c3864648c84255b5ad7243b38d33a8db /usr/bin/composer /usr/bin/composer
+FROM php:8.2.12-fpm@sha256:62fba478afcfb1a31c402ef29b0ae504fe52c1c6b65371e647c4672fa7299951
+COPY --from=composer@sha256:67f1bec07666f688791bff2c13b34b9c35042cc4c1e42fbb5bd4dbe4ae70f0fb /usr/bin/composer /usr/bin/composer
 RUN docker-php-ext-install -j$(nproc) mysqli
 RUN docker-php-ext-install -j$(nproc) pdo
 RUN docker-php-ext-install -j$(nproc) pdo_mysql

diff --git a/package.json b/package.json
@@ -13,11 +13,11 @@
   "devDependencies": {
     "@fortawesome/fontawesome-free": "6.4.2",
     "@types/bootbox": "5.2.8",
-    "@types/bootstrap": "5.2.9",
+    "@types/bootstrap": "5.2.10",
     "@types/isotope-layout": "3.0.12",
-    "@types/jquery": "3.5.27",
-    "@types/lodash": "4.14.201",
-    "@types/sortablejs": "1.15.6",
+    "@types/jquery": "3.5.29",
+    "@types/lodash": "4.14.202",
+    "@types/sortablejs": "1.15.7",
     "autoprefixer": "10.4.16",
     "axios": "1.6.2",
     "bootstrap": "5.3.2",