diff options
author | André Oliveira <37463445+SpecialAro@users.noreply.github.com> | 2022-06-02 19:10:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-02 19:10:50 +0100 |
commit | bf64ce55d3a83a14d4cc47e8fbf889fd978a4f82 (patch) | |
tree | 45103e078ca672c26bdd56e77dae238119de8a8e | |
parent | Fix gh actions (#38) (diff) | |
download | ferdium-server-bf64ce55d3a83a14d4cc47e8fbf889fd978a4f82.tar.gz ferdium-server-bf64ce55d3a83a14d4cc47e8fbf889fd978a4f82.tar.zst ferdium-server-bf64ce55d3a83a14d4cc47e8fbf889fd978a4f82.zip |
Add dynamic version of pnpm and npm (#37)
-rw-r--r-- | Dockerfile | 3 | ||||
-rwxr-xr-x | docker/entrypoint.sh | 4 |
2 files changed, 3 insertions, 4 deletions
@@ -7,8 +7,7 @@ RUN apk add --no-cache python3 make gcc g++ libc-dev sqlite-dev | |||
7 | COPY . /server-build | 7 | COPY . /server-build |
8 | 8 | ||
9 | ENV CI=true | 9 | ENV CI=true |
10 | 10 | RUN NPM_VERSION=$(node -p 'require("./package.json").engines.npm'); npm i -g npm@$NPM_VERSION | |
11 | RUN npm i -g npm@8.7.0 | ||
12 | RUN npm ci --build-from-source --sqlite=/usr/local | 11 | RUN npm ci --build-from-source --sqlite=/usr/local |
13 | 12 | ||
14 | # ---- RUNTIME IMAGE ---------------------------------------------------------- | 13 | # ---- RUNTIME IMAGE ---------------------------------------------------------- |
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 7b66a32..4178d97 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh | |||
@@ -17,8 +17,6 @@ Brought to you by ferdium.org | |||
17 | EOL | 17 | EOL |
18 | 18 | ||
19 | # Update recipes from official git repository | 19 | # Update recipes from official git repository |
20 | npm i -gf pnpm@7.1.2 | ||
21 | |||
22 | if [ ! -d "/app/recipes/.git" ]; # When we mount an existing volume (ferdium-recipes-vol:/app/recipes) if this is only /app/recipes it is always true | 20 | if [ ! -d "/app/recipes/.git" ]; # When we mount an existing volume (ferdium-recipes-vol:/app/recipes) if this is only /app/recipes it is always true |
23 | then | 21 | then |
24 | echo '**** Generating recipes for first run ****' | 22 | echo '**** Generating recipes for first run ****' |
@@ -35,6 +33,8 @@ fi | |||
35 | 33 | ||
36 | cd recipes | 34 | cd recipes |
37 | git config --global --add safe.directory /app/recipes | 35 | git config --global --add safe.directory /app/recipes |
36 | EXPECTED_PNPM_VERSION=$(node -p 'require("./package.json").engines.pnpm') | ||
37 | npm i -gf pnpm@$EXPECTED_PNPM_VERSION | ||
38 | pnpm i | 38 | pnpm i |
39 | pnpm package | 39 | pnpm package |
40 | cd .. | 40 | cd .. |