Skip to content
This repository was archived by the owner on Jan 8, 2024. It is now read-only.

Commit 8a5885f

Browse files
author
D. Domig
authored
Update dependencies (#210)
1 parent a8feed7 commit 8a5885f

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ ARG BASE="fpm-alpine"
1313
###########################
1414

1515
# full kimai source
16-
FROM alpine:3.13.0 AS git-dev
17-
ARG KIMAI="1.11.1"
16+
FROM alpine:3.13.1 AS git-dev
17+
ARG KIMAI="1.12"
1818
# I need to do this check somewhere, we discard all but the checkout so doing here doesn't hurt
1919
ADD test-kimai-version.sh /test-kimai-version.sh
2020
RUN /test-kimai-version.sh
@@ -27,15 +27,15 @@ WORKDIR /opt/kimai
2727
RUN rm -r tests
2828

2929
# composer base image
30-
FROM composer:2.0.8 AS composer
30+
FROM composer:2.0.9 AS composer
3131

3232

3333
###########################
3434
# PHP extensions
3535
###########################
3636

3737
#fpm alpine php extension base
38-
FROM php:7.4.12-fpm-alpine3.12 AS fpm-alpine-php-ext-base
38+
FROM php:7.4.15-fpm-alpine3.13 AS fpm-alpine-php-ext-base
3939
RUN apk add --no-cache \
4040
# build-tools
4141
autoconf \
@@ -70,7 +70,7 @@ RUN apk add --no-cache \
7070

7171

7272
# apache debian php extension base
73-
FROM php:7.4.12-apache-buster AS apache-debian-php-ext-base
73+
FROM php:7.4.15-apache-buster AS apache-debian-php-ext-base
7474
RUN apt-get update
7575
RUN apt-get install -y \
7676
libldap2-dev \
@@ -115,7 +115,7 @@ RUN docker-php-ext-install -j$(nproc) xsl
115115
###########################
116116

117117
# fpm-alpine base build
118-
FROM php:7.4.12-fpm-alpine3.12 AS fpm-alpine-base
118+
FROM php:7.4.15-fpm-alpine3.13 AS fpm-alpine-base
119119
RUN apk add --no-cache \
120120
bash \
121121
freetype \
@@ -143,7 +143,7 @@ HEALTHCHECK --interval=20s --timeout=10s --retries=3 \
143143
# apache-debian base build
144144
###########################
145145

146-
FROM php:7.4.12-apache-buster AS apache-debian-base
146+
FROM php:7.4.15-apache-buster AS apache-debian-base
147147
COPY 000-default.conf /etc/apache2/sites-available/000-default.conf
148148
RUN apt-get update && \
149149
apt-get install -y \

docs/build.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,13 @@ To keep the final image size down we recommend building the php extension in an
5959
e.g. to add xml/xls support to the apache/debian production image
6060

6161
```dockerfile
62-
FROM php:7.4.12-apache-buster AS php-base
62+
FROM php:7.4.15-apache-buster AS php-base
6363
RUN apt-get update
6464
RUN apt-get install -y libxslt-dev libxml2-dev libssl-dev
6565
RUN docker-php-ext-install -j$(nproc) xsl xml xmlrpc xmlwriter simplexml
6666

67-
FROM kimai/kimai2:apache-debian-1.11-prod
67+
FROM kimai/kimai2:apache-debian-1.12-prod
6868
COPY --from=php-base /usr/local/etc/php/conf.d/docker-php-ext-xsl.ini /usr/local/etc/php/conf.d/docker-php-ext-xsl.ini
6969
COPY --from=php-base /usr/local/lib/php/extensions/no-debug-non-zts-20190902/xsl.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/xsl.so
7070

7171
```
72-

0 commit comments

Comments
 (0)