Skip to content

Commit 4e86368

Browse files
Merge pull request #803 from nextcloud/bugfix/790/bump-gettext-to-0.23.1
fix(gettext): Manually install gettext 0.23.1 from ubuntu's DEB
2 parents 604bc35 + 06f87dc commit 4e86368

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

.github/workflows/build-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ jobs:
6666

6767
# Only build non-client containers as multi-arch containers
6868
- name: Build multi-arch Docker image ${{ matrix.dockerfile }}
69-
if: ${{ !startsWith(matrix.dockerfile, 'client') }}
69+
if: ${{ !startsWith(matrix.dockerfile, 'client') && !startsWith(matrix.dockerfile, 'translations') }}
7070
run: |
7171
cd "$(dirname ${{ matrix.dockerfile }})"
7272
docker buildx build --platform linux/amd64,linux/arm64 . --file Dockerfile
7373
7474
- name: Build amd64 Docker image ${{ matrix.dockerfile }}
75-
if: ${{ startsWith(matrix.dockerfile, 'client') }}
75+
if: ${{ startsWith(matrix.dockerfile, 'client') || startsWith(matrix.dockerfile, 'translations') }}
7676
run: |
7777
cd "$(dirname ${{ matrix.dockerfile }})"
7878
docker build . --file Dockerfile

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
- name: Build container image
6969
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
7070
with:
71-
platforms: ${{ startsWith(github.event.inputs.folderPath, 'client') && 'linux/amd64' || 'linux/amd64,linux/arm64' }}
71+
platforms: ${{ (startsWith(github.event.inputs.folderPath, 'client') || startsWith(github.event.inputs.folderPath, 'translations')) && 'linux/amd64' || 'linux/amd64,linux/arm64' }}
7272
push: true
7373
context: ${{ github.event.inputs.folderPath }}
7474
file: '${{ github.event.inputs.folderPath }}/${{ github.event.inputs.dockerFile }}'

translations/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ LABEL org.opencontainers.image.authors="Joas Schilling <joas.schilling@nextcloud
55
RUN apt-get update -q && \
66
DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends \
77
gawk \
8-
gettext \
98
git \
109
gnupg \
1110
make \
@@ -23,6 +22,11 @@ RUN update-ca-certificates
2322
RUN cd /root
2423
RUN curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash
2524

25+
# Install newer gettext version
26+
RUN cd /root
27+
RUN curl http://archive.ubuntu.com/ubuntu/pool/main/g/gettext/gettext_0.23.1-1_amd64.deb -o /root/gettext_0.23.1-1_amd64.deb \
28+
&& apt install -y /root/gettext_0.23.1-1_amd64.deb
29+
2630
ENV PATH=${PATH}:/
2731

2832
RUN mkdir -p /app

0 commit comments

Comments
 (0)