Move Dockerfile to .dockerignore, consolidate apk add

rubynz · Mar 21, 2023 · ab413be · ab413be
1 parent 033edc8
commit ab413be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -38,3 +38,4 @@ yarn-error.log
 app/assets/builds/*
 !app/assets/builds/.keep
 fly.toml
+Dockerfile
diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,16 @@
 from ruby:3.2.1-alpine
 
-RUN apk add postgresql-dev postgresql-client
-RUN apk add nodejs npm
-RUN apk add tzdata
+RUN apk add \
+    # g++ is required for sassc
+    g++ \
+    postgresql-dev \
+    postgresql-client \
+    nodejs \
+    npm \
+    tzdata
 
 # for nokogiri
 RUN apk add --virtual .ruby-gemdeps libc-dev gcc libxml2-dev libxslt-dev make libffi-dev
-# for sassc
-RUN apk add g++
 
 RUN npm install -g yarn
 
@@ -34,8 +37,6 @@ RUN if [ "$RAILS_ENV" = "production" ]; then \
     && chmod 600 /swapfile; \
     fi
 
-RUN rm Dockerfile
-
 EXPOSE ${PORT:-3000}
 CMD if [ -f /swapfile ]; then swapon /swapfile; fi; \
     bundle exec falcon serve -n "${FALCON_INSTANCES:-1}" -b "http://0.0.0.0:${PORT:-3000}"