Modify dockerfile

Author: Msprg

.github/workflows/docker.yml

@@ -53,7 +53,7 @@ jobs:
       with:
         context: .
         push: true
-        platforms: linux/amd64,linux/arm64,linux/arm/v7
+        platforms: linux/amd64
         cache-from: type=gha
         cache-to: type=gha,mode=max
         tags: |

Dockerfile

@@ -5,7 +5,9 @@ FROM debian:12-slim
 ARG DEBIAN_FRONTEND=noninteractive
 ENV APP_DIR=/srv/keys     COMPOSER_ALLOW_SUPERUSER=1
 
-RUN apt-get update && apt-get install -y --no-install-recommends     nginx     php-fpm     php-cli     php-mysql     php-ldap     php-mbstring     php-gmp     php-xml     php-zip     php-curl     php-gd     php-intl     php-bcmath     composer     cron     supervisor     tini     ca-certificates     curl     git     openssh-client     unzip     && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    nginx php-fpm php-cli php-mysql php-ldap php-mbstring php-gmp php-xml php-zip php-curl php-gd \
+    php-intl php-bcmath composer cron supervisor tini ca-certificates curl openssh-client && rm -rf /var/lib/apt/lists/*
 
 RUN useradd --system --home /var/lib/keys-sync --shell /usr/sbin/nologin keys-sync && \
     mkdir -p /var/lib/keys-sync /var/log/ska /var/local/keys-sync /var/log/supervisor && \
@@ -19,9 +21,20 @@ COPY . ${APP_DIR}
 
 RUN composer install --no-dev --prefer-dist --optimize-autoloader
 
-RUN set -eux;     PHP_VERSION="$(php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')";     FPM_DIR="/etc/php/${PHP_VERSION}/fpm";     sed -ri 's|^listen = .+|listen = 9000|' "${FPM_DIR}/pool.d/www.conf";     sed -ri 's|^;*daemonize = yes|daemonize = no|' "${FPM_DIR}/php-fpm.conf";     sed -ri 's|^;*clear_env = .+|clear_env = no|' "${FPM_DIR}/pool.d/www.conf";     sed -ri 's|^;*catch_workers_output = .*|catch_workers_output = yes|' "${FPM_DIR}/pool.d/www.conf";     mkdir -p /run/php /var/lib/php/sessions;     ln -sf "/usr/sbin/php-fpm${PHP_VERSION}" /usr/sbin/php-fpm;     chown www-data:www-data /run/php /var/lib/php/sessions;     chmod 1733 /var/lib/php/sessions
-
-RUN set -eux;     cat <<'NGINX-EOF' >/etc/nginx/nginx.conf;     printf '\n' >>/etc/nginx/nginx.conf
+RUN set -eux; \
+    PHP_VERSION="$(php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')"; \
+    FPM_DIR="/etc/php/${PHP_VERSION}/fpm"; \
+    sed -ri 's|^listen = .+|listen = 9000|' "${FPM_DIR}/pool.d/www.conf"; \
+    sed -ri 's|^;*daemonize = yes|daemonize = no|' "${FPM_DIR}/php-fpm.conf"; \
+    sed -ri 's|^;*clear_env = .+|clear_env = no|' "${FPM_DIR}/pool.d/www.conf"; \
+    sed -ri 's|^;*catch_workers_output = .*|catch_workers_output = yes|' "${FPM_DIR}/pool.d/www.conf"; \
+    mkdir -p /run/php /var/lib/php/sessions; \
+    ln -sf "/usr/sbin/php-fpm${PHP_VERSION}" /usr/sbin/php-fpm; \
+    chown www-data:www-data /run/php /var/lib/php/sessions; \
+    chmod 1733 /var/lib/php/sessions
+
+RUN set -eux; \
+    cat <<'NGINX-EOF' >/etc/nginx/nginx.conf; printf '\n' >>/etc/nginx/nginx.conf
 worker_processes auto;
 
 error_log /dev/stderr info;
@@ -75,7 +88,8 @@ http {
 }
 NGINX-EOF
 
-RUN set -eux;     cat <<'CRON-EOF' >/etc/cron.d/ska;     printf '\n' >>/etc/cron.d/ska;     chmod 0644 /etc/cron.d/ska
+RUN set -eux; \
+    cat <<'CRON-EOF' >/etc/cron.d/ska;     printf '\n' >>/etc/cron.d/ska;     chmod 0644 /etc/cron.d/ska
 SHELL=/bin/bash
 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 

docker-compose.yml.example

@@ -1,7 +1,7 @@
 services:
   ska-app:
     build: .
-    image: ska-app:dev
+    image: msprg/ssh-key-authority
     container_name: ska-app
     restart: unless-stopped
     depends_on: