services/cojedzie/tasks/pre-deploy.yaml

@@ -1,6 +1,6 @@
 ---
 - name: 'Pull all images for "{{ service }}"'
-  when: cojedzie_force_pull_images|default(false)|bool
+  when: cojedzie_force_pull_images|default(false)
   community.docker.docker_image:
     name: "{{ image }}"
     source: pull

services/cojedzie/vars/main.yml

@@ -15,7 +15,6 @@ cojedzie_version: latest
 cojedzie_front_version: "{{ cojedzie_version }}"
 cojedzie_api_version: "{{ cojedzie_version }}"
 cojedzie_worker_version: "{{ cojedzie_version }}"
-cojedzie_mercure_version: "v0.24"
 sentry_dsn_api: https://fd114053dd724e0eb16011ac0da16ba1@o4505224124891136.ingest.sentry.io/4505224126332928
 sentry_dsn_front: https://2815d4e0251240fcb9cd8c81c31e86fe@o4505224124891136.ingest.sentry.io/4505224128233472
 sentry_dsn_front_server: https://e5e0612c4db14123994ff855129c1476@o4505224124891136.ingest.us.sentry.io/4505258045538304

services/cojedzie@next/tasks/pre-deploy.yaml

@@ -1,6 +1,6 @@
 ---
 - name: 'Pull all images for "{{ service }}"'
-  when: cojedzie_force_pull_images|default(false)|bool
+  when: cojedzie_force_pull_images|default(false)
   community.docker.docker_image:
     name: "{{ image }}"
     source: pull

services/cojedzie@next/vars/main.yml

@@ -18,8 +18,6 @@ cojedzie_front_version: "{{ cojedzie_version }}"
 cojedzie_api_version: "{{ cojedzie_version }}"
 cojedzie_worker_version: "{{ cojedzie_version }}"
 
-cojedzie_mercure_version: "v0.24"
-
 sentry_dsn_api: https://fd114053dd724e0eb16011ac0da16ba1@o4505224124891136.ingest.sentry.io/4505224126332928
 sentry_dsn_front: https://2815d4e0251240fcb9cd8c81c31e86fe@o4505224124891136.ingest.sentry.io/4505224128233472
 sentry_dsn_front_server: https://e5e0612c4db14123994ff855129c1476@o4505224124891136.ingest.us.sentry.io/4505258045538304

services/legacy/config/Dockerfile.j2

@@ -1,9 +1,9 @@
-FROM frugan/php-legacy:{{ version }}-fpm
+FROM php:{{ version }}-fpm-alpine
 
 LABEL maintainer="Kacper Donat <kacper@kadet.net>"
 
-# frugan/php-legacy ships all extensions prebuilt, they only need to be enabled
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
-RUN docker-php-ext-enable {{ php_extensions|join(" ") }}
+RUN install-php-extensions {{ php_extensions|join(" ") }}
 
-RUN apt-get update && apt-get install -y --no-install-recommends acl && rm -rf /var/lib/apt/lists/*
+RUN apk update && apk add acl
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer

services/legacy/tasks/_docker.yml

@@ -17,8 +17,8 @@
     build:
       path: "{{ remote_service_path }}/.docker/{{ version }}"
     source: build
-    force_source: "{{ dockerfile.changed or update_images|default(false)|bool }}"
+    force_source: "{{ dockerfile.changed or update_images|default(false) }}"
-    force_tag: "{{ dockerfile.changed or update_images|default(false)|bool }}"
+    force_tag: "{{ dockerfile.changed or update_images|default(false) }}"
   register: image
   notify: Restart services
 

services/legacy/tasks/setup.yml

@@ -1,30 +1,30 @@
 ---
-# - name: Create www-data user for ssh access for legacy services
+- name: Create www-data user for ssh access for legacy services
-#   user:
+  user:
-#     name: www-data
+    name: www-data
-#     group: www-data
+    group: www-data
-#     shell: /bin/bash
+    shell: /bin/bash
-#     system: yes
+    system: yes
-#     password: '!'
+    password: '!'
-#     state: present
+    state: present
-#   register: www_user
+  register: www_user
-#   tags:
+  tags:
-#     - setup
+    - setup
 
-# - name: Add users to www-data group
+- name: Add users to www-data group
-#   user:
+  user:
-#     user: "{{ user }}"
+    user: "{{ user }}"
-#     groups: www-data
+    groups: www-data
-#     append: yes
+    append: yes
-#   loop: "{{ www_data_users }}"
+  loop: "{{ www_data_users }}"
-#   loop_control:
+  loop_control:
-#     loop_var: user 
+    loop_var: user 
 
-# - name: Ensure WWW root exists for legacy services
+- name: Ensure WWW root exists for legacy services
-#   file:
+  file:
-#     path: "{{ www_root }}"
+    path: "{{ www_root }}"
-#     state: directory
+    state: directory
-#     owner: "{{ www_user.uid }}"
+    owner: "{{ www_user.uid }}"
-#     group: "{{ www_user.group }}"
+    group: "{{ www_user.group }}"
-#     mode: g+rw
+    mode: g+rw
 

services/legacy/vars/main.yml

@@ -6,8 +6,6 @@ php_versions: ['7.1', '7.3']
 php_extensions: 
   - bcmath
   - gd
-  - igbinary # required by redis
-  - msgpack # required by redis
   - opcache
   - pdo_mysql
   - redis

services/system/stack.yml

@@ -2,7 +2,7 @@ version: "{{ compose_version }}"
 
 services:
   cronjob-controller:
-    image: crazymax/swarm-cronjob:1.16.1
+    image: crazymax/swarm-cronjob
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
     environment: