Compare commits

...

4 Commits

Author SHA1 Message Date
Kacper Donat
90ea116328 system: Pin swarm-cronjob to 1.16.1
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 22:50:17 +01:00
Kacper Donat
51c56d417e legacy: Switch to frugan/php-legacy base image, drop www-data setup
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 22:50:17 +01:00
Kacper Donat
87ca7726cc Cast boolean flags after applying defaults
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 22:50:17 +01:00
Kacper Donat
0159234873 cojedzie: Pin Mercure version
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 22:50:17 +01:00
9 changed files with 41 additions and 36 deletions

View File

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

View File

@ -15,6 +15,7 @@ cojedzie_version: latest
cojedzie_front_version: "{{ cojedzie_version }}" cojedzie_front_version: "{{ cojedzie_version }}"
cojedzie_api_version: "{{ cojedzie_version }}" cojedzie_api_version: "{{ cojedzie_version }}"
cojedzie_worker_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_api: https://fd114053dd724e0eb16011ac0da16ba1@o4505224124891136.ingest.sentry.io/4505224126332928
sentry_dsn_front: https://2815d4e0251240fcb9cd8c81c31e86fe@o4505224124891136.ingest.sentry.io/4505224128233472 sentry_dsn_front: https://2815d4e0251240fcb9cd8c81c31e86fe@o4505224124891136.ingest.sentry.io/4505224128233472
sentry_dsn_front_server: https://e5e0612c4db14123994ff855129c1476@o4505224124891136.ingest.us.sentry.io/4505258045538304 sentry_dsn_front_server: https://e5e0612c4db14123994ff855129c1476@o4505224124891136.ingest.us.sentry.io/4505258045538304

View File

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

View File

@ -18,6 +18,8 @@ cojedzie_front_version: "{{ cojedzie_version }}"
cojedzie_api_version: "{{ cojedzie_version }}" cojedzie_api_version: "{{ cojedzie_version }}"
cojedzie_worker_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_api: https://fd114053dd724e0eb16011ac0da16ba1@o4505224124891136.ingest.sentry.io/4505224126332928
sentry_dsn_front: https://2815d4e0251240fcb9cd8c81c31e86fe@o4505224124891136.ingest.sentry.io/4505224128233472 sentry_dsn_front: https://2815d4e0251240fcb9cd8c81c31e86fe@o4505224124891136.ingest.sentry.io/4505224128233472
sentry_dsn_front_server: https://e5e0612c4db14123994ff855129c1476@o4505224124891136.ingest.us.sentry.io/4505258045538304 sentry_dsn_front_server: https://e5e0612c4db14123994ff855129c1476@o4505224124891136.ingest.us.sentry.io/4505258045538304

View File

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

View File

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

View File

@ -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

View File

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

View File

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