Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.env
  • Loading branch information
csandanov committed Nov 15, 2023
2 parents 595ef44 + 6668325 commit 92db769
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 35 deletions.
62 changes: 31 additions & 31 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -18,64 +18,64 @@ DB_ADAPTER=postgresql

# Linux (uid 1000 gid 1000)

RUBY_TAG=3.2-dev-0.19.2
#RUBY_TAG=3.1-dev-0.19.2
#RUBY_TAG=3.0-dev-0.19.2
RUBY_TAG=3.2-dev-0.19.3
#RUBY_TAG=3.1-dev-0.19.3
#RUBY_TAG=3.0-dev-0.19.3

# macOS (uid 501 gid 20)

#RUBY_TAG=3.2-dev-macos-0.19.2
#RUBY_TAG=3.1-dev-macos-0.19.2
#RUBY_TAG=3.0-dev-macos-0.19.2
#RUBY_TAG=3.2-dev-macos-0.19.3
#RUBY_TAG=3.1-dev-macos-0.19.3
#RUBY_TAG=3.0-dev-macos-0.19.3

### --- NGINX ----

NGINX_TAG=1.25-5.33.5
#NGINX_TAG=1.24-5.33.5
#NGINX_TAG=1.23-5.33.5
NGINX_TAG=1.25-5.33.6
#NGINX_TAG=1.24-5.33.6
#NGINX_TAG=1.23-5.33.6

### --- NODE ---

NODE_TAG=20-dev-1.26.0
#NODE_TAG=18-dev-1.26.0
NODE_TAG=20-dev-1.27.0
#NODE_TAG=18-dev-1.27.0

### --- POSTGRESQL ----

POSTGRES_TAG=15-1.31.4
#POSTGRES_TAG=14-1.31.4
#POSTGRES_TAG=13-1.31.4
#POSTGRES_TAG=12-1.31.4
#POSTGRES_TAG=11-1.31.4
POSTGRES_TAG=15-1.31.5
#POSTGRES_TAG=14-1.31.5
#POSTGRES_TAG=13-1.31.5
#POSTGRES_TAG=12-1.31.5
#POSTGRES_TAG=11-1.31.5

### --- MARIADB ----

#DB_ROOT_PASSWORD=password

MARIADB_TAG=11.0-3.26.4
#MARIADB_TAG=10.11-3.26.4
#MARIADB_TAG=10.10-3.26.4
#MARIADB_TAG=10.9-3.26.4
#MARIADB_TAG=10.6-3.26.4
#MARIADB_TAG=10.5-3.26.4
#MARIADB_TAG=10.4-3.26.4
MARIADB_TAG=11.0-3.26.5
#MARIADB_TAG=10.11-3.26.5
#MARIADB_TAG=10.10-3.26.5
#MARIADB_TAG=10.9-3.26.5
#MARIADB_TAG=10.6-3.26.5
#MARIADB_TAG=10.5-3.26.5
#MARIADB_TAG=10.4-3.26.5

### --- REDIS ---

REDIS_TAG=7-4.2.1
#REDIS_TAG=6-4.2.1
#REDIS_TAG=5-4.2.1
REDIS_TAG=7-4.2.4
#REDIS_TAG=6-4.2.4
#REDIS_TAG=5-4.2.4

### --- VARNISH ---

VARNISH_TAG=6.0-4.15.0
VARNISH_TAG=6.0-4.15.1

### --- ELASTICSEARCH ---

ELASTICSEARCH_TAG=7-5.18.11
ELASTICSEARCH_TAG=7-5.19.1

### --- KIBANA ---

KIBANA_TAG=7-5.18.11
KIBANA_TAG=7-5.19.1

### --- SOLR ---

Expand All @@ -88,6 +88,6 @@ SOLR_TAG=8-4.18.2

ADMINER_TAG=4-3.24.4
ATHENAPDF_TAG=2.16.0
MEMCACHED_TAG=1-2.15.3
MEMCACHED_TAG=1-2.15.5
RSYSLOG_TAG=latest
OPENSMTPD_TAG=6-1.18.3
OPENSMTPD_TAG=6-1.19.0
8 changes: 4 additions & 4 deletions tests/.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ DB_PASSWORD=ruby
DB_HOST=postgres
DB_ADAPTER=postgresql

REDIS_TAG=7-4.2.1
POSTGRES_TAG=15-1.31.4
NGINX_TAG=1.25-5.33.5
REDIS_TAG=7-4.2.4
POSTGRES_TAG=15-1.31.5
NGINX_TAG=1.25-5.33.6

RUBY_STABILITY_TAG=0.19.2
RUBY_STABILITY_TAG=0.19.3

0 comments on commit 92db769

Please sign in to comment.