Procházet zdrojové kódy

Merge pull request #312 from C4illin/fix/311/use-baseline-build

Emrik Östling před 1 měsícem
rodič
revize
908e91cb91
2 změnil soubory, kde provedl 13 přidání a 5 odebrání
  1. 12 4
      Dockerfile
  2. 1 1
      package.json

+ 12 - 4
Dockerfile

@@ -3,14 +3,22 @@ LABEL org.opencontainers.image.source="https://github.com/C4illin/ConvertX"
 WORKDIR /app
 
 # install bun
-ENV BUN_INSTALL=/etc/.bun
-ENV PATH=$BUN_INSTALL/bin:$PATH
-ENV BUN_RUNTIME_TRANSPILER_CACHE_PATH=0
 RUN apt-get update && apt-get install -y \
   curl \
   unzip \
   && rm -rf /var/lib/apt/lists/*
-RUN curl -fsSL https://bun.sh/install | bash -s "bun-v1.2.2"
+
+# if architecture is arm64, use the arm64 version of bun
+RUN ARCH=$(uname -m) && \
+  if [ "$ARCH" = "aarch64" ]; then \
+    curl -fsSL -o bun-linux-aarch64.zip https://github.com/oven-sh/bun/releases/download/bun-v1.2.2/bun-linux-aarch64.zip; \
+  else \
+    curl -fsSL -o bun-linux-x64-baseline.zip https://github.com/oven-sh/bun/releases/download/bun-v1.2.2/bun-linux-x64-baseline.zip; \
+  fi
+
+RUN unzip -j bun-linux-*.zip -d /usr/local/bin && \
+  rm bun-linux-*.zip && \
+  chmod +x /usr/local/bin/bun
 
 # install dependencies into temp directory
 # this will cache them and speed up future builds

+ 1 - 1
package.json

@@ -7,7 +7,7 @@
     "format": "run-p 'format:*'",
     "format:eslint": "eslint --fix .",
     "format:prettier": "prettier --write .",
-    "build": "bunx @tailwindcss/cli -i ./src/main.css -o ./public/generated.css",
+    "build": "bun x @tailwindcss/cli -i ./src/main.css -o ./public/generated.css",
     "lint": "run-p 'lint:*'",
     "lint:tsc": "tsc --noEmit",
     "lint:knip": "knip",