diff --git a/services/legacy/config/Dockerfile.j2 b/services/legacy/config/Dockerfile.j2 index d545f24..47c51b7 100644 --- a/services/legacy/config/Dockerfile.j2 +++ b/services/legacy/config/Dockerfile.j2 @@ -1,9 +1,9 @@ -FROM php:{{ version }}-fpm-alpine +FROM frugan/php-legacy:{{ version }}-fpm LABEL maintainer="Kacper Donat " -COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/ -RUN install-php-extensions {{ php_extensions|join(" ") }} +# frugan/php-legacy ships all extensions prebuilt, they only need to be enabled +RUN docker-php-ext-enable {{ php_extensions|join(" ") }} -RUN apk update && apk add acl -COPY --from=composer:latest /usr/bin/composer /usr/bin/composer \ No newline at end of file +RUN apt-get update && apt-get install -y --no-install-recommends acl && rm -rf /var/lib/apt/lists/* +COPY --from=composer:latest /usr/bin/composer /usr/bin/composer diff --git a/services/legacy/tasks/setup.yml b/services/legacy/tasks/setup.yml index fdd0776..06576fa 100644 --- a/services/legacy/tasks/setup.yml +++ b/services/legacy/tasks/setup.yml @@ -1,30 +1,30 @@ --- -- name: Create www-data user for ssh access for legacy services - user: - name: www-data - group: www-data - shell: /bin/bash - system: yes - password: '!' - state: present - register: www_user - tags: - - setup +# - name: Create www-data user for ssh access for legacy services +# user: +# name: www-data +# group: www-data +# shell: /bin/bash +# system: yes +# password: '!' +# state: present +# register: www_user +# tags: +# - setup -- name: Add users to www-data group - user: - user: "{{ user }}" - groups: www-data - append: yes - loop: "{{ www_data_users }}" - loop_control: - loop_var: user +# - name: Add users to www-data group +# user: +# user: "{{ user }}" +# groups: www-data +# append: yes +# loop: "{{ www_data_users }}" +# loop_control: +# loop_var: user -- name: Ensure WWW root exists for legacy services - file: - path: "{{ www_root }}" - state: directory - owner: "{{ www_user.uid }}" - group: "{{ www_user.group }}" - mode: g+rw +# - name: Ensure WWW root exists for legacy services +# file: +# path: "{{ www_root }}" +# state: directory +# owner: "{{ www_user.uid }}" +# group: "{{ www_user.group }}" +# mode: g+rw diff --git a/services/legacy/vars/main.yml b/services/legacy/vars/main.yml index 5358639..61c239a 100644 --- a/services/legacy/vars/main.yml +++ b/services/legacy/vars/main.yml @@ -6,6 +6,8 @@ php_versions: ['7.1', '7.3'] php_extensions: - bcmath - gd + - igbinary # required by redis + - msgpack # required by redis - opcache - pdo_mysql - redis