v0.2.0

dockerfiles/alpine.Dockerfile

@@ -1,51 +1,43 @@
 ARG RUBY_VERSION="3.4.3"
-FROM docker.io/library/ruby:${RUBY_VERSION}-alpine AS base
+FROM ruby:${RUBY_VERSION}-alpine AS base
 
-WORKDIR /kubernaut
+WORKDIR /app
 
 RUN <<EOT
-  apk update -q
+  apk update
-  apk add bash
-  rm -rf /var/cache/apk
   gem update --system --no-document
   gem install -N bundler
 EOT
 
-ENV RACK_ENV="production" \
-  BUNDLE_DEPLOYMENT=true \
-  BUNDLE_PATH="/usr/local/bundle" \
-  BUNDLE_WITHOUT="development test"
 
 FROM base AS build
 
+ENV BUNDLE_DEPLOYMENT=true \
+  BUNDLE_WITHOUT="development test"
+
 RUN <<EOT
   apk add musl-dev gcc make
-  rm -rf /var/cache/apk
 EOT
 
-COPY Gemfile Gemfile.lock ./
+COPY Gemfile* .
 
 RUN <<EOT
   bundle install
-  rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
 EOT
 
-COPY . .
 
 FROM base
 
 ENV PORT=4567
 
-RUN <<EOT
+RUN adduser --home /app --disabled-password app
-  addgroup --system --gid 666 kubernaut
-  adduser --system --uid 666 --ingroup kubernaut --shell /bin/bash --disabled-password kubernaut
-EOT
 
-COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"
+USER app:app
-COPY --from=build /kubernaut /kubernaut
 
-USER kubernaut:kubernaut
+COPY --from=build /usr/local/bundle /usr/local/bundle
+COPY --from=build --chown=app:app /app /app
+
+COPY --chown=app:app . .
 
 EXPOSE $PORT
-ENTRYPOINT [ "/kubernaut/dockerfiles/entrypoint.sh" ]
 CMD [ "bundle", "exec", "puma" ]

dockerfiles/bookworm.Dockerfile

@@ -1,51 +1,44 @@
 ARG RUBY_VERSION="3.4.3"
-FROM docker.io/library/ruby:${RUBY_VERSION}-slim-bookworm AS base
+FROM ruby:${RUBY_VERSION}-slim-bookworm AS base
 
-WORKDIR /kubernaut
+WORKDIR /app
 
 RUN <<EOT
-  apt-get update -qq
+  apt-get update
-  rm -rf /var/lib/apt/lists /var/cache/apt/archives
   gem update --system --no-document
   gem install -N bundler
 EOT
 
-ENV RACK_ENV="production" \
-  BUNDLE_DEPLOYMENT=true \
-  BUNDLE_PATH="/usr/local/bundle" \
-  BUNDLE_WITHOUT="development test"
 
 FROM base AS build
 
+ENV BUNDLE_DEPLOYMENT=true \
+  BUNDLE_WITHOUT="development test"
+
 RUN <<EOT
-  apt-get update -qq
   apt-get install --yes --no-install-recommends gcc make libc-dev
-  rm -rf /var/lib/apt/lists /var/cache/apt/archives
 EOT
 
-COPY Gemfile Gemfile.lock ./
+COPY Gemfile* .
 
 RUN <<EOT
   bundle install
-  rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
 EOT
 
-COPY . .
 
 FROM base
 
 ENV PORT=4567
 
-RUN <<EOT
+# RUN useradd ruby --home /app --shell /bin/sh
-  groupadd --system --gid 666 kubernaut
+RUN useradd --home /app --create-home app
-  useradd --system --uid 666 --gid kubernaut --create-home --shell /bin/bash kubernaut
-EOT
 
-COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"
+USER app:app
-COPY --from=build /kubernaut /kubernaut
 
-USER kubernaut:kubernaut
+COPY --from=build /usr/local/bundle /usr/local/bundle
+COPY --from=build --chown=app:app /app /app
+
+COPY --chown=app:app . .
 
 EXPOSE $PORT
-ENTRYPOINT [ "/kubernaut/dockerfiles/entrypoint.sh" ]
 CMD [ "bundle", "exec", "puma" ]

dockerfiles/entrypoint.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-# output debugging info
-ruby --version
-printf "rubygems %s\n" "$(gem --version)"
-bundle version
-
-exec "${@}"