Skip to content

Commit 1ed2d04

Browse files
committed
..
1 parent c406795 commit 1ed2d04

File tree

4 files changed

+39
-9
lines changed

4 files changed

+39
-9
lines changed

Taskfile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ tasks:
66
- docker buildx create --name multiarch --bootstrap --use
77
docker:build:
88
env:
9-
VERSION: 5.1.18
9+
VERSION: 5.1.21
1010
cmds:
1111
- docker build --platform linux/amd64,linux/arm64 --builder=multiarch -t docker.io/tanjim/mautic:install-$VERSION --target=install --push .
1212
- docker build --platform linux/amd64,linux/arm64 --builder=multiarch -t docker.io/tanjim/mautic:console-$VERSION --target=console --push .

charts/mautic/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type: application
1818
# This is the chart version. This version number should be incremented each time you make changes
1919
# to the chart and its templates, including the app version.
2020
# Versions are expected to follow Semantic Versioning (https://semver.org/)
21-
version: 5.1.47
21+
version: 5.1.49
2222

2323
# This is the version number of the application being deployed. This version number should be
2424
# incremented each time you make changes to the application. Versions are not expected to

charts/mautic/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mautic:
55
image:
66
repository: docker.io/tanjim/mautic
77
pullPolicy: IfNotPresent
8-
tag: "5.1.18"
8+
tag: "5.1.21"
99

1010
# existingConfigMap: ""
1111
# ignore the following values if existingConfigMap is set

dockerfile

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.1-apache as core
1+
FROM php:8.1-apache as builder
22

33
ARG MAUTIC_VERSION=5.1
44

@@ -47,7 +47,7 @@ RUN docker-php-ext-configure gd --with-freetype --with-jpeg \
4747
# Install composer
4848
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer
4949

50-
RUN echo "memory_limit = -1" > /usr/local/etc/php/php.ini
50+
RUN echo "memory_limit=-1" > /usr/local/etc/php/php.ini
5151

5252
# Install Mautic
5353
WORKDIR /opt
@@ -61,11 +61,37 @@ RUN rm -rf var/cache/js && \
6161
find node_modules -mindepth 1 -maxdepth 1 -not \( -name 'jquery' -or -name 'vimeo-froogaloop2' -or -name 'remixicon' \) | xargs rm -rf
6262
RUN mv node_modules docroot/
6363

64-
RUN cp -a /opt/mautic/. /var/www/html/
65-
WORKDIR /var/www/html
64+
FROM php:8.1-apache as core
6665

67-
# Clean up
68-
RUN rm -rf /opt/mautic
66+
COPY --from=builder /usr/local/lib/php/extensions /usr/local/lib/php/extensions
67+
COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
68+
69+
RUN apt-get update && apt-get install --no-install-recommends -y \
70+
libcurl4-gnutls-dev \
71+
libc-client-dev \
72+
libkrb5-dev \
73+
libmcrypt-dev \
74+
libssl-dev \
75+
libxml2-dev \
76+
libzip-dev \
77+
libjpeg-dev \
78+
libmagickwand-dev \
79+
libpng-dev \
80+
libgif-dev \
81+
libtiff-dev \
82+
libz-dev \
83+
libpq-dev \
84+
imagemagick \
85+
graphicsmagick \
86+
libwebp-dev \
87+
libjpeg62-turbo-dev \
88+
libxpm-dev \
89+
libaprutil1-dev \
90+
libicu-dev \
91+
libfreetype6-dev \
92+
libonig-dev \
93+
unzip \
94+
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false && rm -rf /var/lib/apt/lists/*
6995

7096
# Configure PHP
7197
ENV PHP_INI_VALUE_DATE_TIMEZONE=UTC \
@@ -76,6 +102,10 @@ ENV PHP_INI_VALUE_DATE_TIMEZONE=UTC \
76102

77103
COPY ./common/php.ini /usr/local/etc/php/php.ini
78104

105+
WORKDIR /var/www/html
106+
107+
COPY --from=builder --chown=www-data:www-data /opt/mautic .
108+
79109
COPY ./bin/ bin/
80110

81111
ENV APACHE_DOCUMENT_ROOT=/var/www/html/docroot

0 commit comments

Comments
 (0)