chore(dockerfile): fix build issue from sentry-cli

2024-08-16 23:50:34 +03:00 · 2023-12-19 20:49:39 +01:00 · 2023-12-19 20:49:39 +01:00 · f11a2b9336
commit f11a2b9336
parent bb86f66b80
5 changed files with 101 additions and 59 deletions
--- a/7
+++ b/7
@ -13,10 +13,9 @@ FROM builder_base AS builder
 WORKDIR /app

 COPY ./pnpm-lock.yaml ./
-COPY ./pnpm-workspace.yaml ./
-COPY ./patches ./patches
-RUN pnpm fetch --no-scripts
+RUN pnpm fetch

+COPY ./pnpm-workspace.yaml ./
 COPY ./package*.json ./
 COPY ./packages/shared ./packages/shared

@ -38,7 +37,7 @@ ARG SENTRY_DISABLE_AUTO_UPLOAD
 ENV SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN}
 ENV SENTRY_DISABLE_AUTO_UPLOAD=${SENTRY_DISABLE_AUTO_UPLOAD}

-RUN npm run build
+RUN pnpm build

 # APP
 FROM node_base AS app
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@ -59,6 +59,8 @@ services:
    build:
      context: .
      dockerfile: ./packages/worker/Dockerfile
+      args:
+        - SENTRY_DISABLE_AUTO_UPLOAD=true
    container_name: tipi-worker
    ports:
      - 3935:3001
--- a/package.json
+++ b/package.json
@ -43,7 +43,7 @@
    "@radix-ui/react-tabs": "^1.0.4",
    "@runtipi/postgres-migrations": "^5.3.0",
    "@runtipi/shared": "workspace:^",
-    "@sentry/nextjs": "^7.86.0",
+    "@sentry/nextjs": "^7.89.0",
    "@tabler/core": "1.0.0-beta20",
    "@tabler/icons-react": "^2.42.0",
    "argon2": "^0.31.2",
--- a/packages/worker/Dockerfile
+++ b/packages/worker/Dockerfile
@ -37,13 +37,12 @@ RUN if [ "${TARGETARCH}" = "arm64" ]; then \
 RUN chmod +x docker-binary

 COPY ./pnpm-lock.yaml ./
-COPY ./pnpm-workspace.yaml ./
-COPY ./patches ./patches
-RUN pnpm fetch --no-scripts
+RUN pnpm fetch --ignore-scripts

+COPY ./pnpm-workspace.yaml ./
 COPY ./packages ./packages

-RUN pnpm install -r --prefer-offline 
+RUN pnpm install -r --prefer-offline

 COPY ./packages/worker/build.js ./packages/worker/build.js
 COPY ./packages/worker/src ./packages/worker/src
@ -51,7 +50,10 @@ COPY ./packages/worker/package.json ./packages/worker/package.json
 COPY ./packages/worker/assets ./packages/worker/assets

 ARG SENTRY_AUTH_TOKEN
+ARG SENTRY_DISABLE_AUTO_UPLOAD
+
 ENV SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN}
+ENV SENTRY_DISABLE_AUTO_UPLOAD=${SENTRY_DISABLE_AUTO_UPLOAD}

 RUN pnpm -r build --filter @runtipi/worker

--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -45,8 +45,8 @@ importers:
        specifier: workspace:^
        version: link:packages/shared
      '@sentry/nextjs':
-        specifier: ^7.86.0
-        version: 7.86.0(next@14.0.4)(react@18.2.0)
+        specifier: ^7.89.0
+        version: 7.89.0(next@14.0.4)(react@18.2.0)
      '@tabler/core':
        specifier: 1.0.0-beta20
        version: 1.0.0-beta20
@ -3086,13 +3086,13 @@ packages:
    resolution: {integrity: sha512-EF3948ckf3f5uPgYbQ6GhyA56Dmv8yg0+ir+BroRjwdxyZJsekhZzawOecC2rOTPCz173t7ZcR1HHZu0dZgOCw==}
    dev: true

-  /@sentry-internal/feedback@7.86.0:
-    resolution: {integrity: sha512-6rl0JYjmAKnhm4/fuFaROh4Ht8oi9f6ZeIcViCuGJcrGICZJJY0s+R77XJI78rNa82PYFrSCcnWXcGji4T8E7g==}
+  /@sentry-internal/feedback@7.89.0:
+    resolution: {integrity: sha512-Uz1A/ex3X/cvHjS3C9qH8ENa1Le7Jesxl3Umuv3n1e/rvoPxo2VFNCgDrpsM1mcg2XwiPkmpyMAVxDMgB0A7JQ==}
    engines: {node: '>=12'}
    dependencies:
-      '@sentry/core': 7.86.0
-      '@sentry/types': 7.86.0
-      '@sentry/utils': 7.86.0
+      '@sentry/core': 7.89.0
+      '@sentry/types': 7.89.0
+      '@sentry/utils': 7.89.0
    dev: false

  /@sentry-internal/tracing@7.86.0:
@ -3104,16 +3104,25 @@ packages:
      '@sentry/utils': 7.86.0
    dev: false

-  /@sentry/browser@7.86.0:
-    resolution: {integrity: sha512-nfYWpVOmug+W7KJO7/xhA1JScMZcYHcoOVHLsUFm4znx51U4qZEk+zZDM11Q2Nw6MuDyEYg6bsH1QCwaoC6nLw==}
+  /@sentry-internal/tracing@7.89.0:
+    resolution: {integrity: sha512-cSwno2NYteBBqOvcm/ue9cJxGGl2uffG4laEyLR9y4we+bYxigfx/Ki2TFOtwXrv5o59eRAtN1lpzaAf43yfBw==}
    engines: {node: '>=8'}
    dependencies:
-      '@sentry-internal/feedback': 7.86.0
-      '@sentry-internal/tracing': 7.86.0
-      '@sentry/core': 7.86.0
-      '@sentry/replay': 7.86.0
-      '@sentry/types': 7.86.0
-      '@sentry/utils': 7.86.0
+      '@sentry/core': 7.89.0
+      '@sentry/types': 7.89.0
+      '@sentry/utils': 7.89.0
+    dev: false
+
+  /@sentry/browser@7.89.0:
+    resolution: {integrity: sha512-84hZOymrKyfjQnbD6d/PhlHCsQHjUGCqVU/K6e7g+JiB1DNZOsfZTkLj6Xj8OQzvwKHWzB9egmJN6IA7dUSJXQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@sentry-internal/feedback': 7.89.0
+      '@sentry-internal/tracing': 7.89.0
+      '@sentry/core': 7.89.0
+      '@sentry/replay': 7.89.0
+      '@sentry/types': 7.89.0
+      '@sentry/utils': 7.89.0
    dev: false

  /@sentry/bundler-plugin-core@2.10.2:
@ -3243,6 +3252,14 @@ packages:
      '@sentry/utils': 7.86.0
    dev: false

+  /@sentry/core@7.89.0:
+    resolution: {integrity: sha512-aU3wfZ+tyFi4T06fOH3z5xnTyMzwvzyEohYOmnQnDrqNgvDzjWkyeUzWse9FaFiut8lBN9O+Pd2H0ucPBMPEhQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@sentry/types': 7.89.0
+      '@sentry/utils': 7.89.0
+    dev: false
+
  /@sentry/esbuild-plugin@2.10.2:
    resolution: {integrity: sha512-1n+ESSkW093zO2ZJtRpepF2SU/qvSOCHczNPfHsKuTpeSZgaGie9WMR39PXMOACFiUG3F0pK7TDTRUmcosBSAQ==}
    engines: {node: '>= 14'}
@ -3255,18 +3272,18 @@ packages:
      - supports-color
    dev: false

-  /@sentry/integrations@7.86.0:
-    resolution: {integrity: sha512-BStRH1yBhhUsvmCXWx88/1+cY93l4B+3RW60RPeYcupvUQ1DJ8qxfN918+nA9XoZt9XELXvs8USCqqynG/aEkg==}
+  /@sentry/integrations@7.89.0:
+    resolution: {integrity: sha512-vj0cXuTkePSMNPHNmIbDEZABriqf4NnjWkwvvOTqFeJWGOg7HiG7FucXi22OdbNcCcN2D6UShbFQOAwL0z2l5Q==}
    engines: {node: '>=8'}
    dependencies:
-      '@sentry/core': 7.86.0
-      '@sentry/types': 7.86.0
-      '@sentry/utils': 7.86.0
+      '@sentry/core': 7.89.0
+      '@sentry/types': 7.89.0
+      '@sentry/utils': 7.89.0
      localforage: 1.10.0
    dev: false

-  /@sentry/nextjs@7.86.0(next@14.0.4)(react@18.2.0):
-    resolution: {integrity: sha512-pdRTt3ELLlpyKKtvumSiqFeTImdSAnoII1JSNwJvmWz9+3MRsvBW/Ee4r19WxK07Y/nxPxyPaIuUmbsXnjkt1A==}
+  /@sentry/nextjs@7.89.0(next@14.0.4)(react@18.2.0):
+    resolution: {integrity: sha512-gTQcsb1+uYal2ep5YjG0zrs5WZbF49ThlsOBPWTzgU6fJt6E2VrO/RFDfDp5De4gXHMsWBQ1Hk1BL/H++8y7uA==}
    engines: {node: '>=8'}
    peerDependencies:
      next: ^10.0.8 || ^11.0 || ^12.0 || ^13.0 || ^14.0
@ -3277,13 +3294,13 @@ packages:
        optional: true
    dependencies:
      '@rollup/plugin-commonjs': 24.0.0(rollup@2.78.0)
-      '@sentry/core': 7.86.0
-      '@sentry/integrations': 7.86.0
-      '@sentry/node': 7.86.0
-      '@sentry/react': 7.86.0(react@18.2.0)
-      '@sentry/types': 7.86.0
-      '@sentry/utils': 7.86.0
-      '@sentry/vercel-edge': 7.86.0
+      '@sentry/core': 7.89.0
+      '@sentry/integrations': 7.89.0
+      '@sentry/node': 7.89.0
+      '@sentry/react': 7.89.0(react@18.2.0)
+      '@sentry/types': 7.89.0
+      '@sentry/utils': 7.89.0
+      '@sentry/vercel-edge': 7.89.0
      '@sentry/webpack-plugin': 1.21.0
      chalk: 3.0.0
      next: 14.0.4(@babel/core@7.23.6)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.5)
@ -3309,27 +3326,40 @@ packages:
      - supports-color
    dev: false

-  /@sentry/react@7.86.0(react@18.2.0):
-    resolution: {integrity: sha512-2bHi+YcG4cT+4xHXXzv+AZpU3pdPUlDBorSgHOpa9At4yxr17UWW2f8bP9wPYRgj+NEIM3YhDgR46FlBu9GSKg==}
+  /@sentry/node@7.89.0:
+    resolution: {integrity: sha512-3uP0HtwsrTKOUi+Az8j/E2YQA9sjHWWLrNo2CiZVOtQNYtH8SZqQeTrnOi9bqhM7NyHtKz1JrXzttj/LWkUvRA==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@sentry-internal/tracing': 7.89.0
+      '@sentry/core': 7.89.0
+      '@sentry/types': 7.89.0
+      '@sentry/utils': 7.89.0
+      https-proxy-agent: 5.0.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /@sentry/react@7.89.0(react@18.2.0):
+    resolution: {integrity: sha512-SoMmwAgAq/GtfR5loM9MSeyxyZAwB6v61C2ENRKcp8JwMf6Ho0usaauUxd5HAnkTbLrapLUDgw9XbUt2XYj8Pw==}
    engines: {node: '>=8'}
    peerDependencies:
      react: 15.x || 16.x || 17.x || 18.x
    dependencies:
-      '@sentry/browser': 7.86.0
-      '@sentry/types': 7.86.0
-      '@sentry/utils': 7.86.0
+      '@sentry/browser': 7.89.0
+      '@sentry/types': 7.89.0
+      '@sentry/utils': 7.89.0
      hoist-non-react-statics: 3.3.2
      react: 18.2.0
    dev: false

-  /@sentry/replay@7.86.0:
-    resolution: {integrity: sha512-YYZO8bfQSx1H87Te/zzyHPLHvExWiYwUfMWW68yGX+PPZIIzxaM81/iCQHkoucxlvuPCOtxCgf7RSMbsnqEa8g==}
+  /@sentry/replay@7.89.0:
+    resolution: {integrity: sha512-iD1E1SbW8Ca34Fn0slM9E0Kh0DjhkZGerPFKqbwjXR7QKCx+ljMRKaCQhb4bBKfVNYZORxpwY4PLJLQ+k6WHJg==}
    engines: {node: '>=12'}
    dependencies:
-      '@sentry-internal/tracing': 7.86.0
-      '@sentry/core': 7.86.0
-      '@sentry/types': 7.86.0
-      '@sentry/utils': 7.86.0
+      '@sentry-internal/tracing': 7.89.0
+      '@sentry/core': 7.89.0
+      '@sentry/types': 7.89.0
+      '@sentry/utils': 7.89.0
    dev: false

  /@sentry/types@7.86.0:
@ -3337,6 +3367,11 @@ packages:
    engines: {node: '>=8'}
    dev: false

+  /@sentry/types@7.89.0:
+    resolution: {integrity: sha512-5Rqt6vIP652p01ypUaEIrELjsHF0vUnzj/JFz+i7nXv6w77GPpNzeIlMYdnauBIgJhLUvYCTQaOPV9GhgZhc4g==}
+    engines: {node: '>=8'}
+    dev: false
+
  /@sentry/utils@7.86.0:
    resolution: {integrity: sha512-6PejFtw9VTFFy5vu0ks+U7Ozkqz+eMt+HN8AZKBKErYzX5/xs0kpkOcSRpu3ETdTYcZf8VAmLVgFgE2BE+3WuQ==}
    engines: {node: '>=8'}
@ -3344,14 +3379,21 @@ packages:
      '@sentry/types': 7.86.0
    dev: false

-  /@sentry/vercel-edge@7.86.0:
-    resolution: {integrity: sha512-+MPb93DXIeYIoaFTT1YpC0myIkXW3xtxhQ7y7QwqS7k6x1zBb34OVCGitdE6+o85RV83sFMMiBxrfKNLt5Ht0A==}
+  /@sentry/utils@7.89.0:
+    resolution: {integrity: sha512-t6qDQajdAjZ6LPraAWO00ZjvDbNH82DoVGV/2o4C5MBPCutJGTGyWIpI2tliYPZPPx+3C2m5L757zh1dCzrgUg==}
    engines: {node: '>=8'}
    dependencies:
-      '@sentry-internal/tracing': 7.86.0
-      '@sentry/core': 7.86.0
-      '@sentry/types': 7.86.0
-      '@sentry/utils': 7.86.0
+      '@sentry/types': 7.89.0
+    dev: false
+
+  /@sentry/vercel-edge@7.89.0:
+    resolution: {integrity: sha512-WZrU6pj+pL1oaJ4x1TSgQuAEn7X5jMygIJ4XTSOoCV68Zb4Ty3vQtkjIKKORXkXHQ9IYP3LsG50acRdsl89rhQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@sentry-internal/tracing': 7.89.0
+      '@sentry/core': 7.89.0
+      '@sentry/types': 7.89.0
+      '@sentry/utils': 7.89.0
    dev: false

  /@sentry/webpack-plugin@1.21.0:
@ -4796,9 +4838,6 @@ packages:
    engines: {node: '>=14.16'}
    dev: false

-  /caniuse-lite@1.0.30001547:
-    resolution: {integrity: sha512-W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA==}
-
  /caniuse-lite@1.0.30001568:
    resolution: {integrity: sha512-vSUkH84HontZJ88MiNrOau1EBrCqEQYgkC5gIySiDlpsm8sGVrhU7Kx4V6h0tnqaHzIHZv08HlJIwPbL4XL9+A==}

@ -9104,7 +9143,7 @@ packages:
      '@next/env': 14.0.4
      '@swc/helpers': 0.5.2
      busboy: 1.6.0
-      caniuse-lite: 1.0.30001547
+      caniuse-lite: 1.0.30001568
      graceful-fs: 4.2.11
      postcss: 8.4.31
      react: 18.2.0