Skip to content

Commit

Permalink
Upgrade to Ubuntu 22.04
Browse files Browse the repository at this point in the history
  • Loading branch information
rajadain committed Jun 28, 2024
1 parent 9d004c6 commit 6f00bab
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ MMW_EXTRA_VARS = {
}

Vagrant.configure("2") do |config|
config.vm.box = "bento/ubuntu-20.04"
config.vm.box = "bento/ubuntu-22.04"

config.vm.define "services" do |services|
services.vm.hostname = "services"
Expand Down
13 changes: 7 additions & 6 deletions deployment/ansible/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ postgresql_password: mmw
postgresql_database: mmw

postgresql_version: "13"
postgresql_package_version: "13.*.pgdg20.04+1"
postgresql_package_version: "13.*.pgdg22.04+1"
postgresql_support_repository_channel: "main"
postgresql_support_libpq_version: "13.*.pgdg20.04+1"
postgresql_support_libpq_version: "13.*.pgdg22.04+1"
postgresql_support_psycopg2_version: "2.8.*"
postgis_version: "3"
postgis_package_version: "3.4*pgdg20.04+1"
postgis_package_version: "3.4*pgdg22.04+1"

daemontools_version: "1:0.76-7"

Expand All @@ -39,9 +39,10 @@ java_version: "8u*"
java_major_version: "8"
java_flavor: "openjdk"

docker_version: "5:19.*"
docker_version: "5:26.*"
docker_containerd_version: "1.6.*"
docker_python_version: "4.4.*"
docker_compose_version: "1.26.*"
docker_compose_version: "1.29.*"

geop_host: "localhost"
geop_port: 8090
Expand All @@ -59,4 +60,4 @@ llvmlite_version: "0.37.0"
numba_version: "0.54.0"
phantomjs_version: "2.1.*"

redis_version: "5:5.0.*"
redis_version: "5:6.0.*"
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
apt: pkg="firefox" state=present

- name: Install Xvfb for JavaScript tests
apt: pkg="xvfb=2:1.20.*" state=present
apt: pkg="xvfb" state=present
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
- name: Install Geospatial libraries
apt:
pkg: ["binutils=2.34*",
"libproj-dev=6.3.*",
"gdal-bin=3.0.*",
"libgdal-dev=3.0.*"]
pkg: ["binutils=2.38*",
"libproj-dev=8.2.*",
"gdal-bin=3.4.*",
"libgdal-dev=3.4.*"]
state: present
when: "['tile-servers'] | is_not_in(group_names)"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
celery_version: 5.2.0
celery_version: 5.4.0
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
- name: Install canvas rendering dependencies
apt:
pkg: ["libcairo2-dev=1.16.*",
"libpango1.0-dev=1.44.*",
"libpango1.0-dev=1.50.*",
"libjpeg8-dev=8c-*",
"libgif-dev=5.1.*"]
state: present

- name: Install Mapnik dependencies
apt:
pkg: ["libmapnik3.0=3.0.*",
"libmapnik-dev=3.0.*",
"mapnik-utils=3.0.*"]
pkg: ["libmapnik3.1=3.1.*",
"libmapnik-dev=3.1.*",
"mapnik-utils=3.1.*"]
state: present

- name: Install Windshaft JavaScript dependencies
Expand Down

0 comments on commit 6f00bab

Please sign in to comment.