diff options
author | Emilien Klein <emilien@klein.st> | 2020-12-06 21:02:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-06 21:02:39 +0100 |
commit | ee07df357bce7bd407ba93fa6b10677b355f631f (patch) | |
tree | 62bc9b59a5ec8af76d34b070b54bffb4c4da6f80 | |
parent | e4b8330e459b598328bf250208386c06ec257b08 (diff) | |
download | Shaarli-ee07df357bce7bd407ba93fa6b10677b355f631f.tar.gz Shaarli-ee07df357bce7bd407ba93fa6b10677b355f631f.tar.zst Shaarli-ee07df357bce7bd407ba93fa6b10677b355f631f.zip |
Upgrade alpine from 3.8 to 3.10 in armhf Dockerfile
The Docker for armhf doesn't build anymore on Alpine 3.8, upgrading to 3.10.
Building works fine on a Rapsberry Pi 4 running Raspbian GNU/Linux 10 (buster)
This is the error with 3.8:
```
[2/4] Fetching packages...
error css-loader@4.3.0: The engine "node" is incompatible with this module. Expected version ">= 10.13.0".
error Found incompatible module
info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command.
The command '/bin/sh -c apk --update --no-cache add yarn nodejs-current python2 build-base && cd /shaarli && yarn install && yarn run build && rm -rf node_modules' returned a non-zero code: 1
```
Not upgrading to 3.11, due to this error:
```
2/4] Fetching packages...
error browserslist@4.14.3: The engine "node" is incompatible with this module. Expected version "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7". Got "13.1.0"
error Found incompatible module.
info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command.
The command '/bin/sh -c apk --update --no-cache add yarn nodejs-current python2 build-base && cd /shaarli && yarn install && yarn run build && rm -rf node_modules' returned a non-zero code: 1
```
Not upgrading to 3.12 either, due to this error:
```
ERROR: unsatisfiable constraints:
py2-pip (missing):
required by: world[py2-pip]
The command '/bin/sh -c apk --update --no-cache add py2-pip && cd /usr/src/app/shaarli && pip install --no-cache-dir mkdocs && mkdocs build --clean' returned a non-zero code: 1
```
There's probably a way to have Python2 pip installed on 3.12, but I suppose other issues would arise (such as the one happening with 3.11), so only proposing to upgrade to 3.10 now. This would probably be looked at more in detail when merging the amd64 and arm/v7 Docker builds, see #1496.
-rw-r--r-- | Dockerfile.armhf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 5bbf6680..471f2397 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf | |||
@@ -1,7 +1,7 @@ | |||
1 | # Stage 1: | 1 | # Stage 1: |
2 | # - Copy Shaarli sources | 2 | # - Copy Shaarli sources |
3 | # - Build documentation | 3 | # - Build documentation |
4 | FROM arm32v6/alpine:3.8 as docs | 4 | FROM arm32v6/alpine:3.10 as docs |
5 | ADD . /usr/src/app/shaarli | 5 | ADD . /usr/src/app/shaarli |
6 | RUN apk --update --no-cache add py2-pip \ | 6 | RUN apk --update --no-cache add py2-pip \ |
7 | && cd /usr/src/app/shaarli \ | 7 | && cd /usr/src/app/shaarli \ |
@@ -10,7 +10,7 @@ RUN apk --update --no-cache add py2-pip \ | |||
10 | 10 | ||
11 | # Stage 2: | 11 | # Stage 2: |
12 | # - Resolve PHP dependencies with Composer | 12 | # - Resolve PHP dependencies with Composer |
13 | FROM arm32v6/alpine:3.8 as composer | 13 | FROM arm32v6/alpine:3.10 as composer |
14 | COPY --from=docs /usr/src/app/shaarli /app/shaarli | 14 | COPY --from=docs /usr/src/app/shaarli /app/shaarli |
15 | RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer \ | 15 | RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer \ |
16 | && cd /app/shaarli \ | 16 | && cd /app/shaarli \ |
@@ -18,7 +18,7 @@ RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer | |||
18 | 18 | ||
19 | # Stage 3: | 19 | # Stage 3: |
20 | # - Frontend dependencies | 20 | # - Frontend dependencies |
21 | FROM arm32v6/alpine:3.8 as node | 21 | FROM arm32v6/alpine:3.10 as node |
22 | COPY --from=composer /app/shaarli /shaarli | 22 | COPY --from=composer /app/shaarli /shaarli |
23 | RUN apk --update --no-cache add yarn nodejs-current python2 build-base \ | 23 | RUN apk --update --no-cache add yarn nodejs-current python2 build-base \ |
24 | && cd /shaarli \ | 24 | && cd /shaarli \ |
@@ -28,7 +28,7 @@ RUN apk --update --no-cache add yarn nodejs-current python2 build-base \ | |||
28 | 28 | ||
29 | # Stage 4: | 29 | # Stage 4: |
30 | # - Shaarli image | 30 | # - Shaarli image |
31 | FROM arm32v6/alpine:3.8 | 31 | FROM arm32v6/alpine:3.10 |
32 | LABEL maintainer="Shaarli Community" | 32 | LABEL maintainer="Shaarli Community" |
33 | 33 | ||
34 | RUN apk --update --no-cache add \ | 34 | RUN apk --update --no-cache add \ |