From b11b2c5999c7105819c8a783ce84995e3ab08382 Mon Sep 17 00:00:00 2001 From: jubilee2 Date: Fri, 24 May 2024 06:46:25 +0000 Subject: [PATCH 1/3] 16.11.3 --- Dockerfile | 9 +++++++++ RELEASE | 4 ++-- assets/update-permissions | 6 +++++- assets/wrapper | 5 ++++- locale.gen | 2 ++ 5 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 locale.gen diff --git a/Dockerfile b/Dockerfile index ac619ce..61c8f56 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,16 +6,25 @@ SHELL ["/bin/sh", "-c"] # Default to supporting utf-8 ENV LANG=C.UTF-8 +# Explicitly set supported locales +COPY locale.gen /etc/locale.gen + # Install required packages RUN apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \ busybox \ ca-certificates \ + locales \ openssh-server \ tzdata \ wget \ libatomic1 \ perl \ + libperl5.34 \ + && locale-gen \ + && cp -a /usr/lib/locale/locale-archive /tmp/locale-archive \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -yq locales \ + && mv /tmp/locale-archive /usr/lib/locale/locale-archive \ && rm -rf /var/lib/apt/lists/* # Use BusyBox diff --git a/RELEASE b/RELEASE index 8c599a7..a0575c0 100644 --- a/RELEASE +++ b/RELEASE @@ -1,4 +1,4 @@ PACKAGECLOUD_REPO=raspberry-pi2 RELEASE_PACKAGE=gitlab-ce -RELEASE_VERSION=16.7.7-ce.0 -DOWNLOAD_URL=https://packages.gitlab.com/gitlab/${PACKAGECLOUD_REPO}/packages/raspbian/buster/${RELEASE_PACKAGE}_${RELEASE_VERSION}_armhf.deb/download.deb +RELEASE_VERSION=16.11.3-ce.0 +DOWNLOAD_URL=https://packages.gitlab.com/gitlab/${PACKAGECLOUD_REPO}/packages/raspbian/bullseye/${RELEASE_PACKAGE}_${RELEASE_VERSION}_armhf.deb/download.deb diff --git a/assets/update-permissions b/assets/update-permissions index 9a0fb52..4e1a9c2 100755 --- a/assets/update-permissions +++ b/assets/update-permissions @@ -91,7 +91,11 @@ fi # Fix registry storage if id -u registry; then - chown_if_exists -R registry:git /var/opt/gitlab/gitlab-rails/shared/registry + if [ -e "/var/opt/gitlab/gitlab-rails/shared/registry" ]; then + find /var/opt/gitlab/gitlab-rails/shared/registry -type d -exec chmod 755 {} \; + find /var/opt/gitlab/gitlab-rails/shared/registry -type f -exec chmod 744 {} \; + fi + chown_if_exists -R registry:git /var/opt/gitlab/gitlab-rails/shared/registry fi # Fix mattermost storage diff --git a/assets/wrapper b/assets/wrapper index 15d453a..a770ae3 100755 --- a/assets/wrapper +++ b/assets/wrapper @@ -105,6 +105,7 @@ if [[ ! -f /etc/gitlab/ssh_host_rsa_key ]]; then fi # sshd loads the keys from /etc/gitlab, but the GitLab backend looks for keys # from within /etc/ssh +ln -fs /etc/gitlab/ssh_host_rsa_key /etc/ssh/ssh_host_rsa_key ln -fs /etc/gitlab/ssh_host_rsa_key.pub /etc/ssh/ssh_host_rsa_key.pub if [[ ! -f /etc/gitlab/ssh_host_ecdsa_key ]]; then @@ -114,6 +115,7 @@ if [[ ! -f /etc/gitlab/ssh_host_ecdsa_key ]]; then fi # sshd loads the keys from /etc/gitlab, but the GitLab backend looks for keys # from within /etc/ssh +ln -fs /etc/gitlab/ssh_host_ecdsa_key /etc/ssh/ssh_host_ecdsa_key ln -fs /etc/gitlab/ssh_host_ecdsa_key.pub /etc/ssh/ssh_host_ecdsa_key.pub if [[ ! -f /etc/gitlab/ssh_host_ed25519_key ]]; then @@ -123,6 +125,7 @@ if [[ ! -f /etc/gitlab/ssh_host_ed25519_key ]]; then fi # sshd loads the keys from /etc/gitlab, but the GitLab backend looks for keys # from within /etc/ssh +ln -fs /etc/gitlab/ssh_host_ed25519_key /etc/ssh/ssh_host_ed25519_key ln -fs /etc/gitlab/ssh_host_ed25519_key.pub /etc/ssh/ssh_host_ed25519_key.pub @@ -149,7 +152,7 @@ gitlab-ctl reconfigure # This must be false when the opt-in PostgreSQL version is the default for pg-upgrade, # otherwise it must be true. -ATTEMPT_AUTO_PG_UPGRADE='false' +ATTEMPT_AUTO_PG_UPGRADE='true' # Make sure PostgreSQL is at the latest version. # If it fails, print a message with a workaround and exit diff --git a/locale.gen b/locale.gen new file mode 100644 index 0000000..22041cd --- /dev/null +++ b/locale.gen @@ -0,0 +1,2 @@ +C.UTF-8 UTF-8 +en_US.UTF-8 UTF-8 \ No newline at end of file From 3cc293d0cae528e81138c1cf85172fe9bb1bccca Mon Sep 17 00:00:00 2001 From: jubilee2 Date: Fri, 24 May 2024 01:52:18 -0500 Subject: [PATCH 2/3] perl 5.32 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 61c8f56..7a55aaa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN apt-get update -q \ wget \ libatomic1 \ perl \ - libperl5.34 \ + libperl5.32 \ && locale-gen \ && cp -a /usr/lib/locale/locale-archive /tmp/locale-archive \ && DEBIAN_FRONTEND=noninteractive apt-get purge -yq locales \ From 766c29f859562fbccd3eaac2f19cae152b73553c Mon Sep 17 00:00:00 2001 From: Jubilee Date: Tue, 28 May 2024 11:09:33 -0500 Subject: [PATCH 3/3] modified: locale.gen --- locale.gen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale.gen b/locale.gen index 22041cd..db8ae36 100644 --- a/locale.gen +++ b/locale.gen @@ -1,2 +1,2 @@ C.UTF-8 UTF-8 -en_US.UTF-8 UTF-8 \ No newline at end of file +en_US.UTF-8 UTF-8