Skip to content

Commit

Permalink
Merge pull request #1886 from tomudding/feature/matomo-v5.1
Browse files Browse the repository at this point in the history
feat: upgrade to matomo v5.1
  • Loading branch information
tomudding authored Aug 10, 2024
2 parents 9260ac3 + bd6a408 commit e3d122d
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions docker/glide/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.3-fpm-alpine as php-target
FROM php:8.3-fpm-alpine AS php-target

RUN apk add --no-cache --virtual .build-deps \
$PHPIZE_DEPS \
Expand Down Expand Up @@ -41,15 +41,15 @@ RUN apk add --no-cache --virtual .build-deps \
&& echo 'Europe/Amsterdam' > /etc/timezone \
&& apk del .build-deps

FROM php-target as composer-build
FROM php-target AS composer-build
WORKDIR /glide

COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
COPY ./composer.json ./composer.lock ./

RUN composer install -o --no-dev

FROM php-target as glide
FROM php-target AS glide
WORKDIR /glide

RUN mkdir cache \
Expand Down
2 changes: 1 addition & 1 deletion docker/matomo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM matomo:5.0-fpm-alpine as gewisweb_matomo
FROM matomo:5.1-fpm-alpine AS gewisweb_matomo

RUN apk add --no-cache --virtual .build-deps \
tzdata \
Expand Down
2 changes: 1 addition & 1 deletion docker/nginx/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginx:stable-alpine as gewisweb_nginx
FROM nginx:stable-alpine AS gewisweb_nginx

RUN adduser -D -H -u 1000 -s /bin/sh www-data -G www-data

Expand Down
2 changes: 1 addition & 1 deletion docker/web/development/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1
RUN composer install

# Compile the SCSS files.
FROM node:lts-alpine as gewisweb_web_styles
FROM node:lts-alpine AS gewisweb_web_styles
WORKDIR /code

COPY ./package.json ./package-lock.json ./
Expand Down
4 changes: 2 additions & 2 deletions docker/web/production/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN msgfmt en.po -o en -c --strict -v \
&& msgfmt nl.po -o nl -c --strict -v

# Create a base image with all PHP dependencies.
FROM php:8.3-fpm-alpine as gewisweb_web_production_base
FROM php:8.3-fpm-alpine AS gewisweb_web_production_base
WORKDIR /code

RUN apk add --no-cache --virtual .build-deps \
Expand Down Expand Up @@ -87,7 +87,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1
RUN composer install -o --no-dev

# Compile the SCSS files.
FROM node:lts-alpine as gewisweb_web_styles
FROM node:lts-alpine AS gewisweb_web_styles
WORKDIR /code

COPY ./package.json ./package-lock.json ./
Expand Down

0 comments on commit e3d122d

Please sign in to comment.