Merge branch 'main' into brown-bag-fun

Author: eddie-rowe

k8s-manifests/storedog-app/deployments/frontend.yaml

@@ -42,7 +42,7 @@ spec:
           image: ${REGISTRY_URL}/frontend:${SD_TAG}
           ports:
             - containerPort: 3000
-          command: ["npm", "run", "dev"]
+          command: ["npm", "run", "prod"]
           env:
             - name: NEXT_PUBLIC_ADS_ROUTE
               valueFrom:
@@ -126,12 +126,13 @@ spec:
             httpGet:
               path: /
               port: 3000
-            initialDelaySeconds: 180
-            periodSeconds: 20
+            initialDelaySeconds: 40
+            periodSeconds: 30
             failureThreshold: 5
           readinessProbe:
             httpGet:
               path: /
               port: 3000
-            initialDelaySeconds: 120
+            initialDelaySeconds: 30
             periodSeconds: 20
+            timeoutSeconds: 5

k8s-manifests/storedog-app/deployments/worker.yaml

@@ -85,8 +85,8 @@ spec:
               memory: "512Mi"
               cpu: "250m"
             limits:
-              memory: "1Gi"
-              cpu: "500m"
+              memory: "2Gi"
+              cpu: "1000m"
           volumeMounts:
             - name: apmsocketpath
               mountPath: /var/run/datadog

services/backend/Dockerfile

@@ -48,6 +48,13 @@ ENV PATH="${BUNDLE_BIN}:${PATH}"
 
 COPY . .
 
+# Upgrade RubyGems and Bundler
+# When upgrading RubyGems
+#  * upgrade Bundler to match the new RubyGems version
+#  * update "BUNDLED WITH" in Gemfile.lock to match the bundler version
+RUN gem update --system 3.5.23
+RUN gem install bundler -v 2.5.23
+
 RUN bundle install || exit 1
 RUN npm install
 RUN npm run build

services/backend/Gemfile

@@ -87,8 +87,8 @@ gem 'activerecord-nulldb-adapter'
 # improved JSON rendering performance
 gem 'oj'
 
-# Fix SCSS errors with Ruby 3 on MacOS
-gem 'sassc', github: 'sass/sassc-ruby', group: :development
+gem 'sassc-rails', '~> 2.1.2'
+gem 'sass', '~> 3.7.4'  # Dart Sass implementation
 
 # Required for Ruby 3.1.7
 gem 'net-smtp'

services/backend/Gemfile.lock

@@ -740,4 +740,4 @@ RUBY VERSION
    ruby 3.1.7
 
 BUNDLED WITH
-   2.3.27
+   2.5.23

services/backend/config/sidekiq.yml

@@ -1,5 +1,5 @@
 ---
-:concurrency: 5
+:concurrency: 2
 :max_memory: 512 # MB
 :gc_interval: 10 # GC every 10 jobs
 :queues: