Skip to content

Commit b11b2c5

Browse files
committed
16.11.3
1 parent 7df1d80 commit b11b2c5

File tree

5 files changed

+22
-4
lines changed

5 files changed

+22
-4
lines changed

Dockerfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,25 @@ SHELL ["/bin/sh", "-c"]
66
# Default to supporting utf-8
77
ENV LANG=C.UTF-8
88

9+
# Explicitly set supported locales
10+
COPY locale.gen /etc/locale.gen
11+
912
# Install required packages
1013
RUN apt-get update -q \
1114
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
1215
busybox \
1316
ca-certificates \
17+
locales \
1418
openssh-server \
1519
tzdata \
1620
wget \
1721
libatomic1 \
1822
perl \
23+
libperl5.34 \
24+
&& locale-gen \
25+
&& cp -a /usr/lib/locale/locale-archive /tmp/locale-archive \
26+
&& DEBIAN_FRONTEND=noninteractive apt-get purge -yq locales \
27+
&& mv /tmp/locale-archive /usr/lib/locale/locale-archive \
1928
&& rm -rf /var/lib/apt/lists/*
2029

2130
# Use BusyBox

RELEASE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
PACKAGECLOUD_REPO=raspberry-pi2
22
RELEASE_PACKAGE=gitlab-ce
3-
RELEASE_VERSION=16.7.7-ce.0
4-
DOWNLOAD_URL=https://packages.gitlab.com/gitlab/${PACKAGECLOUD_REPO}/packages/raspbian/buster/${RELEASE_PACKAGE}_${RELEASE_VERSION}_armhf.deb/download.deb
3+
RELEASE_VERSION=16.11.3-ce.0
4+
DOWNLOAD_URL=https://packages.gitlab.com/gitlab/${PACKAGECLOUD_REPO}/packages/raspbian/bullseye/${RELEASE_PACKAGE}_${RELEASE_VERSION}_armhf.deb/download.deb

assets/update-permissions

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@ fi
9191

9292
# Fix registry storage
9393
if id -u registry; then
94-
chown_if_exists -R registry:git /var/opt/gitlab/gitlab-rails/shared/registry
94+
if [ -e "/var/opt/gitlab/gitlab-rails/shared/registry" ]; then
95+
find /var/opt/gitlab/gitlab-rails/shared/registry -type d -exec chmod 755 {} \;
96+
find /var/opt/gitlab/gitlab-rails/shared/registry -type f -exec chmod 744 {} \;
97+
fi
98+
chown_if_exists -R registry:git /var/opt/gitlab/gitlab-rails/shared/registry
9599
fi
96100

97101
# Fix mattermost storage

assets/wrapper

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ if [[ ! -f /etc/gitlab/ssh_host_rsa_key ]]; then
105105
fi
106106
# sshd loads the keys from /etc/gitlab, but the GitLab backend looks for keys
107107
# from within /etc/ssh
108+
ln -fs /etc/gitlab/ssh_host_rsa_key /etc/ssh/ssh_host_rsa_key
108109
ln -fs /etc/gitlab/ssh_host_rsa_key.pub /etc/ssh/ssh_host_rsa_key.pub
109110

110111
if [[ ! -f /etc/gitlab/ssh_host_ecdsa_key ]]; then
@@ -114,6 +115,7 @@ if [[ ! -f /etc/gitlab/ssh_host_ecdsa_key ]]; then
114115
fi
115116
# sshd loads the keys from /etc/gitlab, but the GitLab backend looks for keys
116117
# from within /etc/ssh
118+
ln -fs /etc/gitlab/ssh_host_ecdsa_key /etc/ssh/ssh_host_ecdsa_key
117119
ln -fs /etc/gitlab/ssh_host_ecdsa_key.pub /etc/ssh/ssh_host_ecdsa_key.pub
118120

119121
if [[ ! -f /etc/gitlab/ssh_host_ed25519_key ]]; then
@@ -123,6 +125,7 @@ if [[ ! -f /etc/gitlab/ssh_host_ed25519_key ]]; then
123125
fi
124126
# sshd loads the keys from /etc/gitlab, but the GitLab backend looks for keys
125127
# from within /etc/ssh
128+
ln -fs /etc/gitlab/ssh_host_ed25519_key /etc/ssh/ssh_host_ed25519_key
126129
ln -fs /etc/gitlab/ssh_host_ed25519_key.pub /etc/ssh/ssh_host_ed25519_key.pub
127130

128131

@@ -149,7 +152,7 @@ gitlab-ctl reconfigure
149152

150153
# This must be false when the opt-in PostgreSQL version is the default for pg-upgrade,
151154
# otherwise it must be true.
152-
ATTEMPT_AUTO_PG_UPGRADE='false'
155+
ATTEMPT_AUTO_PG_UPGRADE='true'
153156

154157
# Make sure PostgreSQL is at the latest version.
155158
# If it fails, print a message with a workaround and exit

locale.gen

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
C.UTF-8 UTF-8
2+
en_US.UTF-8 UTF-8

0 commit comments

Comments
 (0)