From 0abe2f0dcc8415515e37ab8a67c9bca96a72be00 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 10 Aug 2022 20:08:45 +0200 Subject: [PATCH 1/2] Dockerfile/Dockerfile.armhf: update base alpine image to v3.16 - https://hub.docker.com/_/alpine - https://hub.docker.com/r/arm32v6/alpine/ - related https://github.com/shaarli/Shaarli/issues/1757 - related https://github.com/shaarli/Shaarli/issues/1855 --- Dockerfile | 2 +- Dockerfile.armhf | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index e272b7c8..6fdfb1f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN cd shaarli \ # Stage 4: # - Shaarli image -FROM alpine:3.15 +FROM alpine:3.16 LABEL maintainer="Shaarli Community" RUN apk --update --no-cache add \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c25e07c1..b76295fd 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,7 +1,7 @@ # Stage 1: # - Copy Shaarli sources # - Build documentation -FROM arm32v6/alpine:3.10 as docs +FROM arm32v6/alpine:3.16 as docs ADD . /usr/src/app/shaarli RUN apk --update --no-cache add py2-pip \ && cd /usr/src/app/shaarli \ @@ -10,7 +10,7 @@ RUN apk --update --no-cache add py2-pip \ # Stage 2: # - Resolve PHP dependencies with Composer -FROM arm32v6/alpine:3.10 as composer +FROM arm32v6/alpine:3.16 as composer COPY --from=docs /usr/src/app/shaarli /app/shaarli RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer \ && cd /app/shaarli \ @@ -18,7 +18,7 @@ RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer # Stage 3: # - Frontend dependencies -FROM arm32v6/alpine:3.10 as node +FROM arm32v6/alpine:3.16 as node COPY --from=composer /app/shaarli /shaarli RUN apk --update --no-cache add yarn nodejs-current python2 build-base \ && cd /shaarli \ @@ -28,7 +28,7 @@ RUN apk --update --no-cache add yarn nodejs-current python2 build-base \ # Stage 4: # - Shaarli image -FROM arm32v6/alpine:3.10 +FROM arm32v6/alpine:3.16 LABEL maintainer="Shaarli Community" RUN apk --update --no-cache add \ From fdfc09f73ff6155e663c75f5cf1a4da561dc5b1c Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 10 Aug 2022 20:15:21 +0200 Subject: [PATCH 2/2] tests: update base alpine image to v3.16 in test Dockerfiles --- doc/md/dev/Unit-tests.md | 2 +- tests/docker/{alpine36 => alpine316}/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename tests/docker/{alpine36 => alpine316}/Dockerfile (97%) diff --git a/doc/md/dev/Unit-tests.md b/doc/md/dev/Unit-tests.md index ab565e0f..27117613 100644 --- a/doc/md/dev/Unit-tests.md +++ b/doc/md/dev/Unit-tests.md @@ -100,7 +100,7 @@ Unit tests can be run inside [Docker](../Docker.md) containers. Test Dockerfiles are located under `tests/docker//Dockerfile`, and can be used to build Docker images to run Shaarli test suites under commonLinux environments. Dockerfiles are provided for the following environments: -- [`alpine36`](https://github.com/shaarli/Shaarli/blob/master/tests/docker/alpine36/Dockerfile) - [Alpine Linux 3.6](https://www.alpinelinux.org/downloads/) +- [`alpine316`](https://github.com/shaarli/Shaarli/blob/master/tests/docker/alpine36/Dockerfile) - [Alpine Linux 3.16](https://www.alpinelinux.org/downloads/) - [`debian8`](https://github.com/shaarli/Shaarli/blob/master/tests/docker/debian8/Dockerfile) - [Debian 8 Jessie](https://www.debian.org/DebianJessie) (oldoldstable) - [`debian9`](https://github.com/shaarli/Shaarli/blob/master/tests/docker/debian9/Dockerfile) - [Debian 9 Stretch](https://wiki.debian.org/DebianStretch) (oldstable) - [`ubuntu16`](https://github.com/shaarli/Shaarli/blob/master/tests/docker/ubuntu16/Dockerfile) - [Ubuntu 16.04 Xenial Xerus](http://releases.ubuntu.com/16.04/) (old LTS) diff --git a/tests/docker/alpine36/Dockerfile b/tests/docker/alpine316/Dockerfile similarity index 97% rename from tests/docker/alpine36/Dockerfile rename to tests/docker/alpine316/Dockerfile index fa84f6e2..85e22b09 100644 --- a/tests/docker/alpine36/Dockerfile +++ b/tests/docker/alpine316/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.6 +FROM alpine:3.16 MAINTAINER Shaarli Community RUN apk --update --no-cache add \