Commit graph

25 commits

Author SHA1 Message Date
Emin Kocan
4b21cdfcf9 Switch from ubuntu to debian 2024-09-07 20:36:06 +02:00
Emin Kocan
0fb6d40600 make docker image use nodejs v18 2024-07-15 16:44:32 +02:00
Tom Hughes
f37ea2fae3 Update to rails 7.1.1 2023-10-18 18:26:13 +01:00
Andy Allan
6b6c468915 Install git in Docker to allow git repos in Gemfile 2023-09-27 09:34:06 +01:00
Tom Hughes
d238a90244 Merge remote-tracking branch 'upstream/pull/4053' 2023-05-31 18:38:10 +01:00
Andy Allan
d6d16dedb9 Simplify ruby installations
Refs #4048

* We don't currently need a specific version suffix on the package names,
  since ubuntu only ships with one ruby version (and newer versions on
  e.g. 23.04 are fine).
* We don't need to explicitly install libruby, since it's pulled in by
  other packages as required.
* Ubuntu again ships a decent enough version of bundler for our needs,
  so we don't need to install it via rubygems.
2023-05-31 17:55:53 +01:00
Andy Allan
27340d65cd Use default version of node, but use npm to install yarn
* Node 12 is sufficient for now, and aligns with INSTALL.md and vagrant
* Upstream yarnpkg is completely broken, see
  2003697

Refs #4048
2023-05-31 16:04:37 +01:00
Tom Hughes
dc9d52a7c8 Get docker working on Ubuntu 22.04 2023-05-22 18:07:09 +01:00
Tom Hughes
302a53d767 Update minimum ruby version to 3.0 2023-05-16 19:02:29 +01:00
Andy Allan
581bf517cb Use bin/yarn consistently for installations
Since rails 7, the `rails yarn:install` command no longer uses
bin/yarn and so a) doesn't detect yarn binaries named "yarnpkg"
(e.g. Ubuntu) and b) doesn't allow us to pass any flags to yarn,
(e.g. "--ignore-engines").

Since we want to avoid making the installation more difficult (by
e.g. installing yarn from other sources, or requiring particular
node versions) we can instead just use our existing bin/yarn script.

The reason Dockerfile did its own thing was to avoid pulling in
big chunks of rails, but bin/yarn is a standalone ruby script.

Fixes #3579
2023-01-11 13:58:54 +00:00
Tom Hughes
fb9219a52f Use rails instead of rake 2022-12-21 17:09:21 +00:00
Andy Allan
9809750401 Remove imagemagick from dependencies 2022-03-09 17:18:43 +00:00
Tom Hughes
ddb140f387 Switch to using vips for image processing 2022-03-02 19:44:56 +00:00
Andy Allan
cacc8d9a07 Add --ignore-engines for yarn in the Dockerfile
Refs #3275

See also 102f3a6668
2021-07-28 10:14:49 +01:00
Michal Migurski
7be797cbe2 Added explanatory notes and comments 2021-02-12 22:56:17 -08:00
Michal Migurski
4fac47a214 Added /home/osm/traces and /home/osm/images to persistent Docker-compose volumes 2021-01-28 12:03:58 -08:00
Michal Migurski
e19e58f059 Create directories for traces and images 2021-01-28 12:03:58 -08:00
Michal Migurski
033c3b28b3 Added complete Rails test suite
- Added db/functions/functions.sql to docker-compose DB image
- Added `file`, `libgd-dev`, and `unzip` packages to help tests pass
2021-01-28 12:03:58 -08:00
Michal Migurski
8baebaba2f Migrated from ruby:2.7 Docker image to ubuntu:20.04 2021-01-28 12:03:58 -08:00
Michal Migurski
188fc8f1d6 Expanded yarn call to fix test failure 2021-01-28 12:03:58 -08:00
Michal Migurski
b71a6fd5d1 Bumped Ruby version to 2.7 to match CI config 2021-01-28 12:03:58 -08:00
Michal Migurski
c17cb84b46 Replaced raw PGSQL testing file with Osmosis-driven XML file 2021-01-28 12:03:58 -08:00
Jamie Alessio
255ce8708a put osmosis installation back 2021-01-28 12:03:58 -08:00
Jamie Alessio
6624510ed3 Simplify Dockerfile 2021-01-28 12:03:58 -08:00
Jamie Alessio
c514fd62fe Introduce docker-compose config for development 2021-01-28 12:03:58 -08:00