Sync version to 17.3.3 (#130)

* Sync version to 17.3.3

* Merge upstream

---------

Co-authored-by: zengxs <zengxs@users.noreply.github.com>

.github/workflows/build.yml

@@ -21,11 +21,11 @@ jobs:
       matrix:
         include:
           - RELEASE_PACKAGE: gitlab-ce
-            RELEASE_VERSION: 17.3.2-ce.0
-            PUSH_TAGS: 17.3.2-ce.0,17.3.2-ce,17.3-ce,17-ce,ce,latest
+            RELEASE_VERSION: 17.3.3-ce.0
+            PUSH_TAGS: 17.3.3-ce.0,17.3.3-ce,17.3-ce,17-ce,ce,latest
           - RELEASE_PACKAGE: gitlab-ee
-            RELEASE_VERSION: 17.3.2-ee.0
-            PUSH_TAGS: 17.3.2-ee.0,17.3.2-ee,17.3-ee,17-ee,ee
+            RELEASE_VERSION: 17.3.3-ee.0
+            PUSH_TAGS: 17.3.3-ee.0,17.3.3-ee,17.3-ee,17-ee,ee
 
     steps:
       - uses: actions/checkout@v3

Dockerfile

@@ -1,5 +1,11 @@
-FROM ubuntu:22.04
-LABEL maintainer="GitLab Inc. <support@gitlab.com>"
+ARG BASE_IMAGE=docker.io/ubuntu:22.04
+FROM $BASE_IMAGE
+ARG BASE_IMAGE
+LABEL org.opencontainers.image.authors="GitLab Distribution Team <distribution-be@gitlab.com>" \
+      org.opencontainers.image.documentation="https://docs.gitlab.com/ee/install/docker/" \
+      org.opencontainers.image.source="https://gitlab.com/gitlab-org/omnibus-gitlab" \
+      org.opencontainers.image.title="GitLab Omnibus Docker" \
+      org.opencontainers.image.base.name=$BASE_IMAGE
 
 ARG RELEASE_PACKAGE
 ARG RELEASE_VERSION

assets/gitlab.rb

@@ -11,7 +11,7 @@
 
 # Docker options
 ## Prevent Postgres from trying to allocate 25% of total memory
-postgresql['shared_buffers'] = '1MB'
+postgresql['shared_buffers'] = '256MB'
 
 # Disable Prometheus node_exporter inside Docker.
 node_exporter['enable'] = false

assets/update-permissions

@@ -33,6 +33,7 @@ if id -u git; then
 	# Fix data storage
 	chown_if_exists -R git:git /var/opt/gitlab/.ssh
 	chown_if_exists -R git:git /var/opt/gitlab/.gitconfig
+	chown_if_exists -R git:git /var/opt/gitlab/gitaly
 	chown_if_exists -R git:git /var/opt/gitlab/git-data
 	chmod_if_exists 2770 /var/opt/gitlab/git-data/repositories
 	chown_if_exists -R git:git /var/opt/gitlab/gitlab-ci/builds