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.

Sign up for GitHub

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

Merge upstream & Update to 16.9.2 #78

Merged
merged 1 commit into from
Mar 7, 2024
Merged

Merge upstream & Update to 16.9.2 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:
matrix:
include:
- RELEASE_PACKAGE: gitlab-ce
RELEASE_VERSION: 16.9.1-ce.0
PUSH_TAGS: 16.9.1-ce.0,16.9.1-ce,16.9-ce,16-ce,ce,latest
RELEASE_VERSION: 16.9.2-ce.0
PUSH_TAGS: 16.9.2-ce.0,16.9.2-ce,16.9-ce,16-ce,ce,latest
- RELEASE_PACKAGE: gitlab-ee
RELEASE_VERSION: 16.9.1-ee.0
PUSH_TAGS: 16.9.1-ee.0,16.9.1-ee,16.9-ee,16-ee,ee
RELEASE_VERSION: 16.9.2-ee.0
PUSH_TAGS: 16.9.2-ee.0,16.9.2-ee,16.9-ee,16-ee,ee

steps:
- uses: actions/checkout@v3
Expand Down
8 changes: 8 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,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 \
perl \
libperl5.34 \
libatomic1 \
&& 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
2 changes: 2 additions & 0 deletions locale.gen
View file
Open in desktop
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