Build: update compactor install process (rollup now is included)

mateussouzaweb · Feb 13, 2024 · 26f8b6b · 26f8b6b
1 parent 7b3750f
commit 26f8b6b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,9 +22,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          curl https://mateussouzaweb.github.io/compactor/install.sh | bash
+          curl https://mateussouzaweb.github.io/compactor/install.sh | bash -
           npm install
-          npm install --global rollup
 
       - name: Build package
         run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,9 +22,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          curl https://mateussouzaweb.github.io/compactor/install.sh | bash
+          curl https://mateussouzaweb.github.io/compactor/install.sh | bash -
           npm install
-          npm install --global rollup
 
       - name: Build package
         run: |

diff --git a/Dockerfile b/Dockerfile
@@ -3,11 +3,13 @@ LABEL org.opencontainers.image.source https://github.com/mateussouzaweb/crunchyr
 LABEL maintainer="Mateus Souza <mateussouzaweb@gmail.com>"
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Install dependencies
+# Install system packages
 RUN apt update && apt install -y make sed curl
-RUN mkdir -p /usr/local/bin 
-RUN curl https://mateussouzaweb.github.io/compactor/install.sh | bash
-RUN npm install -g rollup
+RUN npm install -g npm
+
+# Install compactor
+RUN mkdir -p /usr/local/bin && \
+    curl https://mateussouzaweb.github.io/compactor/install.sh | bash -
 
 # Create app directory
 WORKDIR /app