examples: thin Dockerfiles that rely on the base

Author: kaysiz

examples/light-service.Dockerfile

@@ -1,20 +1,25 @@
 # syntax=docker/dockerfile:1.7
 #
-# Example for a lighter service using only the slim core base
+# Example for a Canis service using only the slim core base
+# (e.g. events, levriero, sashimi, volpino — after Ruby 4)
+# Base already provides: passenger/nginx, app_env, ntp, root SSH, guarded shoryuken
 
-FROM ghcr.io/datacite/canis-base:v1.2.3
+FROM ghcr.io/datacite/canis-base:1.2.3
 
 LABEL maintainer="support@datacite.org"
 
-# Add only what is unique to your service here
+# Service-only packages (examples)
+# RUN apt-get update && apt-get install -y --no-install-recommends \
+#       default-libmysqlclient-dev imagemagick && \
+#     apt-get clean && rm -rf /var/lib/apt/lists/*
+
 COPY vendor/docker/webapp.conf /etc/nginx/sites-enabled/webapp.conf
-COPY vendor/docker/00_app_env.conf /etc/nginx/conf.d/00_app_env.conf
 
-RUN mkdir -p /etc/service/shoryuken
-COPY vendor/docker/shoryuken.sh /etc/service/shoryuken/run
+# Optional: enable migrations on boot (kept in the app, not the base)
+# COPY vendor/docker/90_migrate.sh /etc/my_init.d/90_migrate.sh
 
-COPY vendor/docker/10_ssh.sh /etc/my_init.d/10_ssh.sh
-COPY vendor/docker/90_migrate.sh /etc/my_init.d/90_migrate.sh
+# Optional: override base shoryuken/ssh/app_env only if this service differs
+# COPY vendor/docker/shoryuken.sh /etc/service/shoryuken/run
 
 COPY . /home/app/webapp/
 RUN mkdir -p tmp/pids tmp/storage && \

examples/lupo.Dockerfile

@@ -1,13 +1,20 @@
 # syntax=docker/dockerfile:1.7
 #
 # Example Lupo Dockerfile using canis-base-tools
+# Base already provides: passenger/nginx, app_env, ntp, root SSH, guarded shoryuken
 
-FROM ghcr.io/datacite/canis-base-tools:v1.2.3
+FROM ghcr.io/datacite/canis-base-tools:1.2.3
 
 LABEL maintainer="support@datacite.org"
 
 ENV NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx/sites-enabled
 
+# Lupo-only packages (not in the shared base)
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+      default-libmysqlclient-dev imagemagick gettext && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
 # Lupo-specific nginx configuration
 COPY vendor/docker/webapp.conf.template /etc/nginx/templates/webapp.conf.template
 COPY vendor/docker/70_nginx_templates.sh /etc/my_init.d/70_nginx_templates.sh
@@ -16,14 +23,7 @@ COPY vendor/docker/70_nginx_templates.sh /etc/my_init.d/70_nginx_templates.sh
 RUN mkdir -p /etc/service/passenger-metrics
 COPY vendor/docker/passenger-metrics-run.sh /etc/service/passenger-metrics/run
 
-# Standard service and startup scripts
-COPY vendor/docker/00_app_env.conf /etc/nginx/conf.d/00_app_env.conf
-COPY vendor/docker/ntp.conf /etc/ntp.conf
-
-RUN mkdir -p /etc/service/shoryuken
-COPY vendor/docker/shoryuken.sh /etc/service/shoryuken/run
-
-COPY vendor/docker/10_ssh.sh /etc/my_init.d/10_ssh.sh
+# Migrations stay in the app (not in the base)
 COPY vendor/docker/90_migrate.sh /etc/my_init.d/90_migrate.sh
 
 # Application code
@@ -32,7 +32,6 @@ RUN mkdir -p tmp/pids tmp/storage && \
     chown -R app:app /home/app/webapp && \
     chmod -R 755 /home/app/webapp
 
-# Install gems
 WORKDIR /home/app/webapp
 RUN mkdir -p vendor/bundle && \
     chown -R app:app . && \