Skip to content

Commit

Permalink
gitlab: upgrade to 16.0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Ikke committed Jun 22, 2023
1 parent 05a1e2d commit 3f3227e
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 118 deletions.
2 changes: 1 addition & 1 deletion VERSIONS
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
GITLAB_VERSION=15.11.6
GITLAB_VERSION=16.0.5
ALPINE_VERSION=3.17
RUBY_VERSION=3.1
10 changes: 5 additions & 5 deletions build-args.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GITLAB_VERSION=15.11.6
GITLAB_MAJOR_VERSION=15.11
GITLAB_WORKHORSE_VERSION=15.11.6
GITALY_SERVER_VERSION=15.11.6
GITLAB_SHELL_VERSION=14.18.0
GITLAB_VERSION=16.0.5
GITLAB_MAJOR_VERSION=16.0
GITLAB_WORKHORSE_VERSION=16.0.5
GITALY_SERVER_VERSION=16.0.5
GITLAB_SHELL_VERSION=14.20.0
35 changes: 21 additions & 14 deletions overlay/tmp/gitlab/database-remove-geo.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
index c1b1247b5b08..a81437d1e1b5 100644
index b210b9c412bc..900612080416 100644
--- a/config/database.yml.postgresql
+++ b/config/database.yml.postgresql
@@ -26,13 +26,6 @@ production:
# username: git
# password: "secure password"
# host: localhost
username: git
password: "secure password"
host: localhost
- geo:
- adapter: postgresql
- encoding: unicode
Expand All @@ -17,9 +17,9 @@ index c1b1247b5b08..a81437d1e1b5 100644
#
# Development specific
@@ -57,13 +50,6 @@ development:
# host: localhost
# variables:
# statement_timeout: 15s
host: localhost
variables:
statement_timeout: 15s
- geo:
- adapter: postgresql
- encoding: unicode
Expand All @@ -31,9 +31,9 @@ index c1b1247b5b08..a81437d1e1b5 100644
#
# Staging specific
@@ -84,13 +70,6 @@ staging:
# username: git
# password: "secure password"
# host: localhost
username: git
password: "secure password"
host: localhost
- geo:
- adapter: postgresql
- encoding: unicode
Expand All @@ -44,14 +44,21 @@ index c1b1247b5b08..a81437d1e1b5 100644

# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
@@ -117,10 +96,3 @@ test: &test
# prepared_statements: false
# variables:
# statement_timeout: 15s
@@ -117,17 +96,3 @@ test: &test
prepared_statements: false
variables:
statement_timeout: 15s
- geo:
- adapter: postgresql
- encoding: unicode
- database: gitlabhq_geo_test
- username: postgres
- password:
- host: localhost
- embedding:
- adapter: postgresql
- encoding: unicode
- database: gitlabhq_embedding_test
- username: postgres
- password:
- host: localhost
61 changes: 0 additions & 61 deletions overlay/tmp/gitlab/mr-119042-mr-failed.patch

This file was deleted.

35 changes: 0 additions & 35 deletions overlay/tmp/gitlab/openssl-3.0.patch

This file was deleted.

2 changes: 0 additions & 2 deletions overlay/usr/local/bin/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@ apply_patch -p0 -i /tmp/gitlab/puma-no-redirect.patch
apply_patch -p0 -i /tmp/gitlab/puma-socket-path.patch
apply_patch -p1 -i /tmp/gitlab/cable-defaults.patch
apply_patch -p1 -i /tmp/gitlab/database-remove-geo.patch
apply_patch -p1 -i /tmp/gitlab/mr-119042-mr-failed.patch
apply_patch -p1 -i /tmp/gitlab/openssl-3.0.patch
apply_patch -p1 -i /tmp/gitlab/ruby-3.1-compat.patch
apply_patch -p0 -i /tmp/logrotate/logrotate-defaults.patch
apply_patch -p0 -i /tmp/nginx/nginx-config.patch
Expand Down

0 comments on commit 3f3227e

Please sign in to comment.