Fix

zhulik · Jan 24, 2023 · 7f2916c · 7f2916c
1 parent 990e843
commit 7f2916c
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/backup-stats-collector/Dockerfile b/backup-stats-collector/Dockerfile
@@ -1,3 +1,26 @@
+FROM openfaas/of-watchdog:0.8.2 as watchdog
+FROM ruby:3.2.0-slim as base
+
+WORKDIR /mnt
+
+RUN adduser --system app &&\
+    bundle config --local path vendor/bundle &&\
+    bundle config set --local deployment 'true' &&\
+    bundle config set --local without 'development test'
+
+COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
+RUN chmod +x /usr/bin/fwatchdog
+
+EXPOSE 8080
+HEALTHCHECK --interval=2s CMD curl -f http://127.0.0.1:4567/healthcheck
+
+ENV fprocess="bundle exec falcon serve -b http://0.0.0.0 -p 4567 -n 1"
+ENV upstream_url="http://127.0.0.1:4567"
+ENV mode="http"
+ENV APP_ENV="production"
+
+CMD ["fwatchdog"]
+
 FROM ghcr.io/zhulik/fn-builder as builder
 
 RUN apt-get update &&\
@@ -9,7 +32,7 @@ RUN wget -O- https://github.com/restic/restic/releases/download/v0.15.0/restic_0
 COPY function/Gemfile function/Gemfile.lock ./
 RUN bundle install
 
-FROM ghcr.io/zhulik/fn-base
+FROM base
 
 COPY --from=builder /mnt/ .
 COPY --from=builder /usr/bin/restic /usr/bin

diff --git a/base/Dockerfile.base b/base/Dockerfile.base
@@ -3,6 +3,11 @@ FROM ruby:3.2.0-slim
 
 WORKDIR /mnt
 
+RUN adduser --system app &&\
+    bundle config --local path vendor/bundle &&\
+    bundle config set --local deployment 'true' &&\
+    bundle config set --local without 'development test'
+
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog
 

diff --git a/base/Gemfile b/base/Gemfile
@@ -4,3 +4,5 @@ gem "falcon"
 gem "sentry-ruby"
 gem "sinatra"
 gem "zeitwerk"
+gem "ox"
+gem "aws-sdk-s3"