Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BZDB="-mysql8"
FROM bugzilla/bugzilla-perl-slim${BZDB}:20240419.1
ARG BZDB="-mysql"
FROM bugzilla/bugzilla-perl-slim${BZDB}:20250925.1

ENV DEBIAN_FRONTEND noninteractive

Expand Down
5 changes: 3 additions & 2 deletions Makefile.PL
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ my %requires = (
'Role::Tiny' => '2.000003',
'Scope::Guard' => '0.21',
'Sereal' => '4.004',
'Sub::Identify' => 0,
'Sub::Quote' => '2.005000',
'Template' => '3.008',
'Text::CSV_XS' => '1.26',
Expand Down Expand Up @@ -199,7 +200,7 @@ my %optional_features = (
jsonrpc => {
description => 'JSON-RPC Interface',
prereqs => {
runtime => {requires => {'JSON::RPC' => '== 1.01', 'Test::Taint' => '1.06'}}
runtime => {requires => {'JSON::RPC' => '1.01', 'Test::Taint' => '1.06'}}
}
},
linux_pdeath => {
Expand Down Expand Up @@ -283,7 +284,7 @@ my %optional_features = (
rest => {
description => 'REST Interface',
prereqs => {
runtime => {requires => {'Test::Taint' => '1.06', 'JSON::RPC' => '==1.01',}}
runtime => {requires => {'Test::Taint' => '1.06', 'JSON::RPC' => '1.01',}}
}
},
s3 => {
Expand Down
1 change: 1 addition & 0 deletions cpanfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ requires 'Role::Tiny', '2.000003';
requires 'SOAP::Lite', '0.712';
requires 'Scope::Guard', '0.21';
requires 'Sereal', '4.004';
requires 'Sub::Identify';
requires 'Sub::Quote', '2.005000';
requires 'Sys::Syslog';
requires 'Template', '3.008';
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.test-mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
bugzilla6.test:
build:
args:
- BZDB=-mariadb106
- BZDB=-mariadb
context: .
dockerfile: Dockerfile
command: dev_httpd
Expand Down
10 changes: 5 additions & 5 deletions docker-compose.test-pg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
bugzilla6.test:
build:
args:
- BZDB=-pg9
- BZDB=-pg
context: .
dockerfile: Dockerfile
command: dev_httpd
Expand All @@ -18,7 +18,7 @@ services:
environment:
- 'BMO_inbound_proxies=*'
- BMO_db_driver=pg
- BMO_db_host=bugzilla6.pgsql9
- BMO_db_host=bugzilla6.pgsql13
- BMO_db_name=bugs
- BMO_db_pass=bugs
- BMO_db_user=bugs
Expand All @@ -40,12 +40,12 @@ services:
- TWD_HOST=selenium
- TWD_PORT=4444
depends_on:
- bugzilla6.pgsql9
- bugzilla6.pgsql13
- memcached
- selenium

bugzilla6.pgsql9:
image: postgres:9.0
bugzilla6.pgsql13:
image: postgres:13.22
tmpfs:
- /tmp
logging:
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ services:
- selenium

bugzilla6.mysql8:
build:
context: .
dockerfile: docker/images/Dockerfile.mysql8
image: mysql:8
command:
- '--max_allowed_packet=64M'
tmpfs:
- /tmp
logging:
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ services:
# - memcached

bugzilla6.mysql8:
build:
context: .
dockerfile: docker/images/Dockerfile.mysql8
image: mysql:8
command:
- '--max_allowed_packet=64M'
volumes:
- bugzilla6-mysql-db:/var/lib/mysql
tmpfs:
Expand Down
115 changes: 0 additions & 115 deletions docker/gen-bugzilla-perl-slim.sh

This file was deleted.

113 changes: 0 additions & 113 deletions docker/gen-bugzilla-slim-mariadb106.sh

This file was deleted.

Loading