Update all locales with the latest Transifex translations

Merge pull request #13444 from garethdavisrogers/fix-docker-dependency-and-db-dev-env
Added cmake dep to dockerfile and added script for db:schema:load tha…
2026-01-14 18:56:49 +00:00 · 2025-08-25 11:49:44 +05:00 · 2025-08-25 14:10:10 +10:00 · 2025-08-22 12:49:24 -04:00 · 2025-08-22 08:31:27 -04:00 · 2025-08-22 16:12:26 +10:00
6 changed files with 97 additions and 28 deletions
--- a/6
+++ b/6
@@ -2,7 +2,9 @@ FROM ruby:3.1.4-alpine3.19 AS base
 ENV LANG=C.UTF-8 \
    LC_ALL=C.UTF-8 \
    TZ=Europe/London \
-    RAILS_ROOT=/usr/src/app
+    RAILS_ROOT=/usr/src/app \
+    BUNDLE_PATH=/bundles \
+    BUNDLE_APP_CONFIG=/bundles
 RUN apk --no-cache upgrade && \
    apk add --no-cache tzdata postgresql-client imagemagick imagemagick-jpeg && \
    apk add --no-cache --virtual wkhtmltopdf
@@ -14,7 +16,7 @@ FROM base AS development-base
 RUN apk add --no-cache --virtual .build-deps \
    build-base postgresql-dev git nodejs yarn && \
    apk add --no-cache --virtual .dev-utils \
-    bash curl less vim chromium-chromedriver zlib-dev openssl-dev \
+    bash curl less vim chromium-chromedriver zlib-dev openssl-dev cmake\
    readline-dev yaml-dev sqlite-dev libxml2-dev libxslt-dev libffi-dev vips-dev && \
    curl -o /usr/local/bin/wait-for-it https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh && \
    chmod +x /usr/local/bin/wait-for-it
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -25,7 +25,8 @@ RUN apt-get update && apt-get install -y \
  libjemalloc-dev \
  libssl-dev \
  ca-certificates \
-  gnupg
+  gnupg \
+  cmake

 # Setup ENV variables
 ENV PATH /usr/local/src/rbenv/shims:/usr/local/src/rbenv/bin:/usr/local/src/nodenv/shims:/usr/local/src/nodenv/bin:$PATH
--- a/compose.yaml
+++ b/compose.yaml
@@ -5,20 +5,36 @@ services:
    environment:
      POSTGRES_PASSWORD: f00d
      POSTGRES_USER: ofn
-      POSTGRES_DB: open_food_network_dev
    ports:
      - 5432:5432
    volumes:
      - 'postgres:/var/lib/postgresql/data'
+    healthcheck:
+      test: ["CMD-SHELL", "PGPASSWORD=$$POSTGRES_PASSWORD pg_isready -q -h 127.0.0.1 -p 5432 -U $$POSTGRES_USER || exit 1"]
+      interval: 5s
+      timeout: 10s
+      retries: 10
+
  redis:
    image: redis
+
+  bundler:
+    build: .
+    # Runs once: installs gems into /bundles, writes a checksum sentinel, then exits
+    command: >
+      sh -lc 'bundle install --jobs 4 --retry 3 --quiet;
+              sha256sum Gemfile.lock > /bundles/.Gemfile.lock.sha'
+    volumes:
+      - .:/usr/src/app
+      - gems:/bundles
+    restart: "no"
+
  web:
    tty: true
    stdin_open: true
    build: .
    ports:
      - 3000:3000
-      - 3035:3035
    volumes:
      - .:/usr/src/app
      - gems:/bundles
@@ -26,20 +42,69 @@ services:
      - /etc/timezone:/etc/timezone:ro
      - /etc/localtime:/etc/localtime:ro
    depends_on:
-      - db
-      - redis
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_started
+      webpack:
+        condition: service_started
    environment:
      DOCKER: true
+      DEV_CACHING: true
      OFN_DB_HOST: db
      OFN_REDIS_URL: redis://redis/
      OFN_REDIS_JOBS_URL: redis://redis
      OFN_REDIS_TEST_URL: redis://redis/3
+      WEBPACKER_DEV_SERVER_HOST: webpack
+      WEBPACKER_DEV_SERVER_PORT: 3035
+      WEBPACKER_DEV_SERVER_PUBLIC: localhost:3035
+
    command: >
-      bash -c "rm -f tmp/pids/server.pid &&
-               (bundle check || bundle install) &&
-               bundle exec rake db:create &&
-               yarn install &&
-               bundle exec foreman start -f Procfile.docker"
+      sh -lc 'rm -f tmp/pids/server.pid;
+              until [ -f /bundles/.Gemfile.lock.sha ] && sha256sum -c /bundles/.Gemfile.lock.sha >/dev/null 2>&1; do sleep 0.5; done;
+              bundle exec rails db:prepare &&
+              yarn install &&
+              exec bundle exec rails s -b 0.0.0.0 -p 3000'
+
+  sidekiq:
+    build: .
+    command: >
+      sh -lc 'until [ -f /bundles/.Gemfile.lock.sha ] && sha256sum -c /bundles/.Gemfile.lock.sha >/dev/null 2>&1; do sleep 0.5; done;
+              exec bundle exec sidekiq'
+    depends_on:
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_started
+    volumes:
+      - .:/usr/src/app
+      - gems:/bundles
+    environment:
+      DOCKER: true
+      DEV_CACHING: true
+      OFN_DB_HOST: db
+      OFN_REDIS_URL: redis://redis/
+      OFN_REDIS_JOBS_URL: redis://redis
+      OFN_REDIS_TEST_URL: redis://redis/3
+
+  webpack:
+    build: .
+    command: >
+      sh -lc 'until [ -f /bundles/.Gemfile.lock.sha ] && sha256sum -c /bundles/.Gemfile.lock.sha >/dev/null 2>&1; do sleep 0.5; done;
+              exec ./bin/webpack-dev-server'
+    ports:
+      - "3035:3035"
+    volumes:
+      - .:/usr/src/app
+      - gems:/bundles
+    healthcheck:
+      test: ["CMD-SHELL", "wget -qO- http://localhost:3035/webpack-dev-server >/dev/null || wget -qO- http://localhost:3035/sockjs-node/info >/dev/null"]
+      interval: 5s
+      timeout: 3s
+      retries: 30
+
+    environment:
+      WEBPACKER_DEV_SERVER_HOST: 0.0.0.0
 volumes:
  gems:
  postgres:
--- a/config/locales/en_CA.yml
+++ b/config/locales/en_CA.yml
@@ -3618,7 +3618,7 @@ en_CA:
            removed_terms_and_conditions_successfully: "Terms and Conditions file removed successfully"
    insufficient_stock: "Insufficient stock available, only %{on_hand} remaining"
    out_of_stock:
-      reduced_stock_available: Reduced stock available
+      reduced_stock_available: 'Reduced stock '
      out_of_stock_text: >
          While you've been shopping, the stock levels for one or more of the products
          in your cart have reduced. Here's what's changed:
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
    "pretty-quick": "pretty-quick"
  },
  "dependencies": {
-    "@floating-ui/dom": "^1.7.3",
+    "@floating-ui/dom": "^1.7.4",
    "@hotwired/stimulus": "^3.2",
    "@hotwired/turbo": "^8.0.13",
    "@rails/webpacker": "5.4.4",
--- a/yarn.lock
+++ b/yarn.lock
@@ -1134,10 +1134,10 @@
  dependencies:
    "@floating-ui/utils" "^0.2.10"

-"@floating-ui/dom@^1.7.3":
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.7.3.tgz#6174ac3409e6a064bbdf1f4bb07188ee9461f8cf"
-  integrity sha512-uZA413QEpNuhtb3/iIKoYMSK07keHPYeXF02Zhd6e213j+d1NamLix/mCLxBUDW/Gx52sPH2m+chlUsyaBs/Ag==
+"@floating-ui/dom@^1.7.4":
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.7.4.tgz#ee667549998745c9c3e3e84683b909c31d6c9a77"
+  integrity sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==
  dependencies:
    "@floating-ui/core" "^1.7.3"
    "@floating-ui/utils" "^0.2.10"
@@ -2729,12 +2729,12 @@ ci-info@^3.2.0:
  integrity sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==

 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
-  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.6.tgz#8fe672437d01cd6c4561af5334e0cc50ff1955f7"
+  integrity sha512-3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw==
  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
+    inherits "^2.0.4"
+    safe-buffer "^5.2.1"

 cjs-module-lexer@^1.0.0:
  version "1.2.2"
@@ -8352,12 +8352,13 @@ setprototypeof@1.2.0:
  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==

 sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8:
-  version "2.4.11"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
+  version "2.4.12"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.12.tgz#eb8b568bf383dfd1867a32c3f2b74eb52bdbf23f"
+  integrity sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==
  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
+    inherits "^2.0.4"
+    safe-buffer "^5.2.1"
+    to-buffer "^1.2.0"

 shebang-command@^1.2.0:
  version "1.2.0"
Author	SHA1	Message	Date
Ahmed Ejaz	7fcb31d563	Update all locales with the latest Transifex translations	2025-08-25 11:49:44 +05:00
Gaetan Craig-Riou	31a7374808	Merge pull request #13444 from garethdavisrogers/fix-docker-dependency-and-db-dev-env Added cmake dep to dockerfile and added script for db:schema:load tha…	2025-08-25 14:10:10 +10:00
Gareth	e5ce06ae39	Updated branch	2025-08-22 12:49:24 -04:00
Gareth Rogers	5f64204d51	Merge branch 'master' into fix-docker-dependency-and-db-dev-env	2025-08-22 08:31:27 -04:00
Maikel	4b558b4820	Merge pull request #13501 from openfoodfoundation/dependabot/npm_and_yarn/sha.js-2.4.12 Bump sha.js from 2.4.11 to 2.4.12	2025-08-22 16:12:26 +10:00
Maikel	e224b8f63b	Merge pull request #13500 from openfoodfoundation/dependabot/npm_and_yarn/cipher-base-1.0.6 Bump cipher-base from 1.0.4 to 1.0.6	2025-08-22 16:11:30 +10:00
Maikel	80bb0606b4	Merge pull request #13499 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.7.4 Bump @floating-ui/dom from 1.7.3 to 1.7.4	2025-08-22 15:50:47 +10:00
dependabot[bot]	499fcc791e	Bump sha.js from 2.4.11 to 2.4.12 Bumps [sha.js](https://github.com/crypto-browserify/sha.js) from 2.4.11 to 2.4.12. - [Changelog](https://github.com/browserify/sha.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/crypto-browserify/sha.js/compare/v2.4.11...v2.4.12) --- updated-dependencies: - dependency-name: sha.js dependency-version: 2.4.12 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2025-08-21 15:48:41 +00:00
dependabot[bot]	30dae3c3ea	Bump cipher-base from 1.0.4 to 1.0.6 Bumps [cipher-base](https://github.com/crypto-browserify/cipher-base) from 1.0.4 to 1.0.6. - [Changelog](https://github.com/browserify/cipher-base/blob/master/CHANGELOG.md) - [Commits](https://github.com/crypto-browserify/cipher-base/compare/v1.0.4...v1.0.6) --- updated-dependencies: - dependency-name: cipher-base dependency-version: 1.0.6 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2025-08-21 15:23:41 +00:00
dependabot[bot]	af247c32a3	Bump @floating-ui/dom from 1.7.3 to 1.7.4 Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.7.3 to 1.7.4. - [Release notes](https://github.com/floating-ui/floating-ui/releases) - [Changelog](https://github.com/floating-ui/floating-ui/blob/master/packages/dom/CHANGELOG.md) - [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.7.4/packages/dom) --- updated-dependencies: - dependency-name: "@floating-ui/dom" dependency-version: 1.7.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-08-21 09:48:24 +00:00
Gareth	6f9dcf7e27	remove bundle check	2025-08-20 11:04:40 -04:00
Gareth	2d064bab64	Created a bundler service that runs once removing responsibilities from any other services. The bundler service always runs install which should still be pretty fast if nothing or only a few gems have changed. A healthcheck won't work unless bundler runs continuously which is impractical. Instead, a checksum is generated on bundle install and sentinels in the other services have a definite confirmation that bundle is complete. The nice thing about this approach is that web, webpack, and sidekiq (which share the same bundles dependencies) will not concurrently run bundle install solving dep install redundancies.	2025-08-20 10:13:20 -04:00
Gareth	b69eb9bdff	Specified BUNDLE_PATH AND BUNDLE_APP_CONFIG in Dockerfile	2025-08-20 08:48:21 -04:00
Gareth	b95d798a27	Fixed webpack service so that web relies on its bundles. This has re-enabled JS	2025-08-18 12:24:27 -04:00
Gareth	e1e4aeac1f	Added conditions to sidekiq too as it races db as well. Everything seems functional now	2025-08-18 11:52:52 -04:00
Gareth	c7ae47053e	Added health check to avoid docker container racing	2025-08-18 11:38:57 -04:00
Gareth Rogers	5892ae1800	Merge branch 'master' into fix-docker-dependency-and-db-dev-env	2025-08-18 09:32:21 -04:00
Gareth	74368f939b	By creating the db in the container on composition, the first migration file rejects the schema of the empty database. All I had to do was remove db creation from docker so that db:prepare will default to creating open_food_network_dev from schema.rb rather than perceiving a mismatch from the precreated docker db	2025-08-15 14:23:13 -04:00
Gareth	cb02cd39fe	Reverting unexpected change to schema.rb as requested	2025-08-15 12:27:10 -04:00
Gareth	3750898c44	Looks like db:prepare never fully ran and that's why it did not work. The issue seems to be using foreman with web, webpack, and sidekiq in the same script. Though not dependent on each other, the build order or port assignment was causing web to exit early upon build	2025-08-06 15:21:30 -04:00
Gareth	d34f8900d7	divided foreman queued services into 3 containers. Web was exiting seemingly at random and seems to be a conflict between web, web-pack, and sidekiq being run through foreman. The division into 3 dev containers has been very consistent in building the project correctly	2025-08-06 15:05:45 -04:00
Gareth	addf36a304	dummy commit for docker token check	2025-07-30 20:44:05 -04:00
Gareth	6a912b7d8c	Added cmake dep to dockerfile and added script for db:schema:load that runs only if the schema is different than the latest migration	2025-07-30 20:12:53 -04:00