From: Tom Hughes <tom@compton.nu>
Date: Wed, 31 May 2023 17:38:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4053'
X-Git-Tag: live~1652
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d238a90244f6706dacbb18576243a4c1f650c080?hp=-c

Merge remote-tracking branch 'upstream/pull/4053'
---

d238a90244f6706dacbb18576243a4c1f650c080
diff --combined Dockerfile
index c85a64046,02d9ff170..f3c56e161
--- a/Dockerfile
+++ b/Dockerfile
@@@ -20,15 -20,17 +20,16 @@@ RUN apt-get update 
        libxslt1-dev \
        locales \
        postgresql-client \
-       ruby3.0 \
-       ruby3.0-dev \
+       ruby \
+       ruby-dev \
+       ruby-bundler \
        software-properties-common \
        tzdata \
        unzip \
 - && curl https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
 - && add-apt-repository -y -U https://deb.nodesource.com/node_18.x \
 - && apt-get install --no-install-recommends -y \
        nodejs \
 +      npm \
   && npm install --global yarn \
 + # We can't use snap packages for firefox inside a container, so we need to get firefox+geckodriver elsewhere
   && add-apt-repository -y ppa:mozillateam/ppa \
   && echo "Package: *\nPin: release o=LP-PPA-mozillateam\nPin-Priority: 1001" > /etc/apt/preferences.d/mozilla-firefox \
   && apt-get install --no-install-recommends -y \
@@@ -48,8 -50,7 +49,7 @@@ WORKDIR /ap
  
  # Install Ruby packages
  ADD Gemfile Gemfile.lock /app/
- RUN gem install bundler \
-  && bundle install
+ RUN bundle install
  
  # Install NodeJS packages using yarn
  ADD package.json yarn.lock /app/
diff --combined script/vagrant/setup/provision.sh
index d48fb9d0b,8fb296ae6..d34c46008
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@@ -16,12 -16,11 +16,11 @@@ apt-get updat
  apt-get upgrade -y
  
  # install packages as explained in INSTALL.md
- apt-get install -y ruby3.0 libruby3.0 ruby3.0-dev \
+ apt-get install -y ruby ruby-dev ruby-bundler \
                       libxml2-dev libxslt1-dev nodejs npm \
                       build-essential git-core \
                       postgresql postgresql-contrib libpq-dev libvips-dev \
                       libsasl2-dev libffi-dev libgd-dev libarchive-dev libbz2-dev
- gem3.0 install --version "~> 2.1.4" bundler
  npm install --global yarn
  
  ## install the bundle necessary for openstreetmap-website
@@@ -34,6 -33,8 +33,6 @@@ bundle exec bin/yarn instal
  db_user_exists=`sudo -u postgres psql postgres -tAc "select 1 from pg_roles where rolname='vagrant'"`
  if [ "$db_user_exists" != "1" ]; then
      sudo -u postgres createuser -s vagrant
 -    sudo -u vagrant createdb -E UTF-8 -O vagrant openstreetmap
 -    sudo -u vagrant createdb -E UTF-8 -O vagrant osm_test
  fi
  
  # set up sample configs
@@@ -44,8 -45,6 +43,8 @@@ if [ ! -f config/storage.yml ]; the
      cp config/example.storage.yml config/storage.yml
  fi
  touch config/settings.local.yml
 +# create the databases
 +sudo -u vagrant bundle exec rails db:create
  # migrate the database to the latest version
  sudo -u vagrant bundle exec rails db:migrate
  popd