Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

16.11 #18

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.32 \
&& 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
Expand Down
4 changes: 2 additions & 2 deletions RELEASE
Original file line number Diff line number Diff line change
@@ -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
6 changes: 5 additions & 1 deletion assets/update-permissions
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion assets/wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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


Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions locale.gen
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
C.UTF-8 UTF-8
en_US.UTF-8 UTF-8
Loading