Multistage build

zhulik · Jan 15, 2023 · be2cf48 · be2cf48
1 parent 1a3a3f5
commit be2cf48
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/hass-listener/Dockerfile b/hass-listener/Dockerfile
@@ -1,38 +1,31 @@
-# TODO: mulstistage build
-FROM openfaas/of-watchdog:0.8.2 as watchdog
-
-FROM ruby:3.2.0-slim-buster
-
-COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
-RUN chmod +x /usr/bin/fwatchdog
-
-RUN apt-get update &&\
-  apt-get install -qy --no-install-recommends build-essential
-
-RUN mkdir -p /home/app/function
-
-WORKDIR /home/app/function
-
-RUN addgroup --system app &&\
-    adduser --system --ingroup app app
-
-RUN chown app:app -R /home/app
-
-USER app
+FROM ruby:3.2.0-slim as base
 
+RUN adduser app
+WORKDIR /mnt
+RUN bundle config --local path vendor/bundle
 EXPOSE 8080
-
 HEALTHCHECK --interval=2s CMD curl -f http://127.0.0.1:4567/healthcheck
 
-ENV fprocess="ruby index.rb"
+ENV fprocess="bundle exec ruby index.rb"
 ENV upstream_url="http://127.0.0.1:4567"
 ENV mode="http"
 ENV APP_ENV="production"
 
 CMD ["fwatchdog"]
 
-COPY function/Gemfile .
+FROM base as builder
 
+RUN apt-get update &&\
+  apt-get install -qy --no-install-recommends build-essential
+COPY function/Gemfile .
 RUN bundle install
 
+
+FROM openfaas/of-watchdog:0.8.2 as watchdog
+FROM base
+
+COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
+RUN chmod +x /usr/bin/fwatchdog
+COPY --from=builder /mnt/ .
 COPY function .
+USER app
diff --git a/hass-listener/function/Gemfile b/hass-listener/function/Gemfile
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem "sinatra", "~> 3"
+gem "sinatra", "~> 3.0"
 gem "falcon", "~> 0.42"
diff --git a/hass-listener/function/index.rb b/hass-listener/function/index.rb
@@ -1,6 +1,6 @@
 require "sinatra"
 
-require_relative "handler"
+require_relative "lib/handler"
 
 handler = Handler.new
 

diff --git a/hass-listener/function/handler.rb → hass-listener/function/lib/handler.rb b/hass-listener/function/handler.rb → hass-listener/function/lib/handler.rb
diff --git a/stack.yml b/stack.yml