Fix docker setup

puzzle · Nov 15, 2024 · d587f81 · d587f81
1 parent 28166b7
commit d587f81
Show file tree

Hide file tree

Showing 5 changed files with 1,010 additions and 18 deletions.
diff --git a/.docker/entrypoint.sh b/.docker/entrypoint.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+gem install bundler
 bundle install
 
 bin/rails db:migrate RAILS_ENV=development

diff --git a/.docker/webpack-entrypoint.sh b/.docker/webpack-entrypoint.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+yarn add [email protected] --dev
 yarn install
 
 exec "$@"
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,7 +30,7 @@ services:
     tty: true
     stdin_open: true
   pg:
-    image: postgis/postgis:14-3.3-alpine
+    image: postgis/postgis:16-3.5-alpine
     environment:
       - POSTGRES_USER=decidim_zuerich
       - POSTGRES_PASSWORD=dN5GH8y3lX

diff --git a/package.json b/package.json
@@ -57,6 +57,7 @@
     "marked": "^5.1.2",
     "prettier": "^3.3.3",
     "select2": "^4.1.0-rc.0",
-    "stylelint": "^13.11.0"
+    "stylelint": "^13.11.0",
+    "webpack-dev-server": "4.15.1"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     set -e
+    gem install bundler
     bundle install
     bin/rails db:migrate RAILS_ENV=development
@@ Expand Down @@