Merge pull request #6112 from consuldemocracy/postgres14
Use postgreSQL 14 as postgres Docker image
This commit is contained in:
2
.github/workflows/db_schema.yml
vendored
2
.github/workflows/db_schema.yml
vendored
@@ -15,7 +15,7 @@ jobs:
|
|||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
services:
|
services:
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:13.16
|
image: postgres:14.19
|
||||||
ports: ["5432:5432"]
|
ports: ["5432:5432"]
|
||||||
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
|
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
|
||||||
env:
|
env:
|
||||||
|
|||||||
2
.github/workflows/tests.yml
vendored
2
.github/workflows/tests.yml
vendored
@@ -19,7 +19,7 @@ jobs:
|
|||||||
timeout-minutes: 60
|
timeout-minutes: 60
|
||||||
services:
|
services:
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:13.16
|
image: postgres:14.19
|
||||||
ports: ["5432:5432"]
|
ports: ["5432:5432"]
|
||||||
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
|
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ tests:
|
|||||||
image: "ruby:3.3.8"
|
image: "ruby:3.3.8"
|
||||||
stage: test
|
stage: test
|
||||||
services:
|
services:
|
||||||
- postgres:13.16
|
- postgres:14.19
|
||||||
cache:
|
cache:
|
||||||
key: consul
|
key: consul
|
||||||
paths:
|
paths:
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ You can access the main website of the project at [http://consuldemocracy.org](h
|
|||||||
**NOTE**:
|
**NOTE**:
|
||||||
The installation process will vary depending on your operating system. Please make sure to follow the [Local Installation Guide](docs/en/installation/local_installation.md) appropriate for your OS.
|
The installation process will vary depending on your operating system. Please make sure to follow the [Local Installation Guide](docs/en/installation/local_installation.md) appropriate for your OS.
|
||||||
|
|
||||||
Prerequisites: install git, Ruby 3.3.8, CMake, pkg-config, Node.js 20.19.2, ImageMagick and PostgreSQL (>=9.5).
|
Prerequisites: install git, Ruby 3.3.8, CMake, pkg-config, Node.js 20.19.2, ImageMagick and PostgreSQL (>=13).
|
||||||
|
|
||||||
**Note**: The `bin/setup` command below might fail if you've configured a username and password for PostgreSQL. If that's the case, edit the lines containing `username:` and `password:` (adding your credentials) in the `config/database.yml` file and run `bin/setup` again.
|
**Note**: The `bin/setup` command below might fail if you've configured a username and password for PostgreSQL. If that's the case, edit the lines containing `username:` and `password:` (adding your credentials) in the `config/database.yml` file and run `bin/setup` again.
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ Puedes acceder a la página principal del proyecto en [http://consuldemocracy.or
|
|||||||
**NOTA**:
|
**NOTA**:
|
||||||
El proceso de instalación varía según el sistema operativo. Por favor, consulta la [documentación de instalación local](docs/es/installation/local_installation.md) apropiada para tu SO.
|
El proceso de instalación varía según el sistema operativo. Por favor, consulta la [documentación de instalación local](docs/es/installation/local_installation.md) apropiada para tu SO.
|
||||||
|
|
||||||
Prerrequisitos: tener instalado git, Ruby 3.3.8, CMake, pkg-config, Node.js 20.19.2, ImageMagick y PostgreSQL (9.5 o superior).
|
Prerrequisitos: tener instalado git, Ruby 3.3.8, CMake, pkg-config, Node.js 20.19.2, ImageMagick y PostgreSQL (13 o superior).
|
||||||
|
|
||||||
**Nota**: Es posible que ejecutar `bin/setup`, como se indica a continuación, falle si has configurado un nombre de usuario y contraseña para PostgreSQL. Si es así, edita las líneas que contienen `username:` y `password:` (añadiendo tus credenciales) en el fichero `config/database.yml` y ejecuta `bin/setup` de nuevo.
|
**Nota**: Es posible que ejecutar `bin/setup`, como se indica a continuación, falle si has configurado un nombre de usuario y contraseña para PostgreSQL. Si es así, edita las líneas que contienen `username:` y `password:` (añadiendo tus credenciales) en el fichero `config/database.yml` y ejecuta `bin/setup` de nuevo.
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ services:
|
|||||||
|
|
||||||
# use the preferred version of the official Postgres image
|
# use the preferred version of the official Postgres image
|
||||||
# see https://hub.docker.com/_/postgres/
|
# see https://hub.docker.com/_/postgres/
|
||||||
image: postgres:13.16
|
image: postgres:14.19-bookworm
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_USER=postgres
|
- POSTGRES_USER=postgres
|
||||||
- POSTGRES_PASSWORD=$POSTGRES_PASSWORD
|
- POSTGRES_PASSWORD=$POSTGRES_PASSWORD
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ You can access the main website of the project at [http://consuldemocracy.org](h
|
|||||||
|
|
||||||
**NOTE**: For more detailed instructions, check the [local installation docs](installation/local_installation.md).
|
**NOTE**: For more detailed instructions, check the [local installation docs](installation/local_installation.md).
|
||||||
|
|
||||||
Prerequisites: install git, Ruby 3.3.8, CMake, pkg-config, Node.js 20.19.2, ImageMagick and PostgreSQL (>=9.5).
|
Prerequisites: install git, Ruby 3.3.8, CMake, pkg-config, Node.js 20.19.2, ImageMagick and PostgreSQL (>=13).
|
||||||
|
|
||||||
**Note**: The `bin/setup` command below might fail if you've configured a username and password for PostgreSQL. If that's the case, edit the lines containing `username:` and `password:` (adding your credentials) in the `config/database.yml` file and run `bin/setup` again.
|
**Note**: The `bin/setup` command below might fail if you've configured a username and password for PostgreSQL. If that's the case, edit the lines containing `username:` and `password:` (adding your credentials) in the `config/database.yml` file and run `bin/setup` again.
|
||||||
|
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ You should see an output similar to this:
|
|||||||
```bash
|
```bash
|
||||||
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
|
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
|
||||||
603ec83b78a6 consuldemocracy-app "./docker-entrypoint…" 23 seconds ago Up 22 seconds consuldemocracy-app-run-afb6d68e2d99
|
603ec83b78a6 consuldemocracy-app "./docker-entrypoint…" 23 seconds ago Up 22 seconds consuldemocracy-app-run-afb6d68e2d99
|
||||||
d57fdd9637d6 postgres:13.16 "docker-entrypoint.s…" 50 minutes ago Up 22 seconds 5432/tcp consuldemocracy-database-1
|
d57fdd9637d6 postgres:14.19 "docker-entrypoint.s…" 50 minutes ago Up 22 seconds 5432/tcp consuldemocracy-database-1
|
||||||
```
|
```
|
||||||
|
|
||||||
## Running tests with RSpec
|
## Running tests with RSpec
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ Puedes acceder a la página principal del proyecto en [http://consuldemocracy.or
|
|||||||
|
|
||||||
**NOTA**: para unas instrucciones más detalladas, consulta la [documentación de instalación local](installation/local_installation.md).
|
**NOTA**: para unas instrucciones más detalladas, consulta la [documentación de instalación local](installation/local_installation.md).
|
||||||
|
|
||||||
Prerrequisitos: tener instalado git, Ruby 3.3.8, CMake, pkg-config, Node.js 20.19.2, ImageMagick y PostgreSQL (9.5 o superior).
|
Prerrequisitos: tener instalado git, Ruby 3.3.8, CMake, pkg-config, Node.js 20.19.2, ImageMagick y PostgreSQL (13 o superior).
|
||||||
|
|
||||||
**Nota**: Es posible que ejecutar `bin/setup`, como se indica a continuación, falle si has configurado un nombre de usuario y contraseña para PostgreSQL. Si es así, edita las líneas que contienen `username:` y `password:` (añadiendo tus credenciales) en el fichero `config/database.yml` y ejecuta `bin/setup` de nuevo.
|
**Nota**: Es posible que ejecutar `bin/setup`, como se indica a continuación, falle si has configurado un nombre de usuario y contraseña para PostgreSQL. Si es así, edita las líneas que contienen `username:` y `password:` (añadiendo tus credenciales) en el fichero `config/database.yml` y ejecuta `bin/setup` de nuevo.
|
||||||
|
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ Deberías obtener algo similar a:
|
|||||||
```bash
|
```bash
|
||||||
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
|
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
|
||||||
603ec83b78a6 consuldemocracy-app "./docker-entrypoint…" 23 seconds ago Up 22 seconds consuldemocracy-app-run-afb6d68e2d99
|
603ec83b78a6 consuldemocracy-app "./docker-entrypoint…" 23 seconds ago Up 22 seconds consuldemocracy-app-run-afb6d68e2d99
|
||||||
d57fdd9637d6 postgres:13.16 "docker-entrypoint.s…" 50 minutes ago Up 22 seconds 5432/tcp consuldemocracy-database-1
|
d57fdd9637d6 postgres:14.19 "docker-entrypoint.s…" 50 minutes ago Up 22 seconds 5432/tcp consuldemocracy-database-1
|
||||||
```
|
```
|
||||||
|
|
||||||
## Ejecutar tests con RSpec
|
## Ejecutar tests con RSpec
|
||||||
|
|||||||
@@ -121,5 +121,5 @@ dependsOn:
|
|||||||
- name: Node.js
|
- name: Node.js
|
||||||
version: "20.19.2"
|
version: "20.19.2"
|
||||||
- name: PostgreSQL
|
- name: PostgreSQL
|
||||||
versionMin: "9.5"
|
versionMin: "13"
|
||||||
- name: ImageMagick
|
- name: ImageMagick
|
||||||
|
|||||||
Reference in New Issue
Block a user