Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1867 from shaarli/docker-update-alpine

Browse source 
Dockerfile/Dockerfile.armhf: update base alpine image to v3.16
This commit is contained in:
nodiscc 2022-08-10 20:23:49 +02:00 committed by GitHub
commit 91dbe63e00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -26,7 +26,7 @@ RUN cd shaarli \
# Stage 4: # Stage 4:
# - Shaarli image # - Shaarli image
FROM alpine:3.15 FROM alpine:3.16
LABEL maintainer="Shaarli Community" LABEL maintainer="Shaarli Community"
RUN apk --update --no-cache add \ RUN apk --update --no-cache add \

8
Dockerfile.armhf
View file

@ -1,7 +1,7 @@
# Stage 1: # Stage 1:
# - Copy Shaarli sources # - Copy Shaarli sources
# - Build documentation # - Build documentation
FROM arm32v6/alpine:3.10 as docs FROM arm32v6/alpine:3.16 as docs
ADD . /usr/src/app/shaarli ADD . /usr/src/app/shaarli
RUN apk --update --no-cache add py2-pip \ RUN apk --update --no-cache add py2-pip \
&& cd /usr/src/app/shaarli \ && cd /usr/src/app/shaarli \
@ -10,7 +10,7 @@ RUN apk --update --no-cache add py2-pip \
# Stage 2: # Stage 2:
# - Resolve PHP dependencies with Composer # - 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 COPY --from=docs /usr/src/app/shaarli /app/shaarli
RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer \ RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer \
&& cd /app/shaarli \ && cd /app/shaarli \
@ -18,7 +18,7 @@ RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer
# Stage 3: # Stage 3:
# - Frontend dependencies # - Frontend dependencies
FROM arm32v6/alpine:3.10 as node FROM arm32v6/alpine:3.16 as node
COPY --from=composer /app/shaarli /shaarli COPY --from=composer /app/shaarli /shaarli
RUN apk --update --no-cache add yarn nodejs-current python2 build-base \ RUN apk --update --no-cache add yarn nodejs-current python2 build-base \
&& cd /shaarli \ && cd /shaarli \
@ -28,7 +28,7 @@ RUN apk --update --no-cache add yarn nodejs-current python2 build-base \
# Stage 4: # Stage 4:
# - Shaarli image # - Shaarli image
FROM arm32v6/alpine:3.10 FROM arm32v6/alpine:3.16
LABEL maintainer="Shaarli Community" LABEL maintainer="Shaarli Community"
RUN apk --update --no-cache add \ RUN apk --update --no-cache add \

2
doc/md/dev/Unit-tests.md
View file

@ -100,7 +100,7 @@ Unit tests can be run inside [Docker](../Docker.md) containers.
Test Dockerfiles are located under `tests/docker/<distribution>/Dockerfile`, and can be used to build Docker images to run Shaarli test suites under commonLinux environments. Dockerfiles are provided for the following environments: Test Dockerfiles are located under `tests/docker/<distribution>/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) - [`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) - [`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) - [`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)

2
tests/docker/alpine36/Dockerfile → tests/docker/alpine316/Dockerfile
View file

@ -1,4 +1,4 @@
FROM alpine:3.6 FROM alpine:3.16
MAINTAINER Shaarli Community MAINTAINER Shaarli Community
RUN apk --update --no-cache add \ RUN apk --update --no-cache add \