* Bump base image to Ubuntu 24

* Fix Noble dependencies

* Fix docker image build

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
Mario Vitale
2024-07-25 14:23:37 +02:00
коммит произвёл GitHub
родитель 50f73caeca
Коммит 88bbc9dcb8
4 изменённых файлов: 15 добавлений и 14 удалений

2
.github/workflows/docker-push-mirrored.yml поставляемый
Просмотреть файл

@@ -11,7 +11,7 @@ jobs:
build-docker: build-docker:
name: cd/Push mirrored docker images name: cd/Push mirrored docker images
if: github.repository_owner == 'mattermost' if: github.repository_owner == 'mattermost'
runs-on: ubuntu-22.04 runs-on: ubuntu-latest
steps: steps:
- name: Checkout mattermost project - name: Checkout mattermost project
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

2
.github/workflows/e2e-fulltests-ci.yml поставляемый
Просмотреть файл

@@ -36,7 +36,7 @@ concurrency:
jobs: jobs:
generate-test-variables: generate-test-variables:
runs-on: ubuntu-22.04 runs-on: ubuntu-latest
permissions: permissions:
issues: write issues: write
pull-requests: write pull-requests: write

16
.github/workflows/e2e-tests-ci-template.yml поставляемый
Просмотреть файл

@@ -77,7 +77,7 @@ on:
jobs: jobs:
update-initial-status: update-initial-status:
runs-on: ubuntu-22.04 runs-on: ubuntu-latest
steps: steps:
- uses: mattermost/actions/delivery/update-commit-status@main - uses: mattermost/actions/delivery/update-commit-status@main
env: env:
@@ -90,7 +90,7 @@ jobs:
status: pending status: pending
cypress-check: cypress-check:
runs-on: ubuntu-22.04 runs-on: ubuntu-latest
needs: needs:
- update-initial-status - update-initial-status
defaults: defaults:
@@ -121,7 +121,7 @@ jobs:
npm run check npm run check
playwright-check: playwright-check:
runs-on: ubuntu-22.04 runs-on: ubuntu-latest
needs: needs:
- update-initial-status - update-initial-status
defaults: defaults:
@@ -158,7 +158,7 @@ jobs:
npm run check npm run check
generate-build-variables: generate-build-variables:
runs-on: ubuntu-22.04 runs-on: ubuntu-latest
needs: needs:
- update-initial-status - update-initial-status
defaults: defaults:
@@ -181,7 +181,7 @@ jobs:
echo "workers="$(jq --slurp --compact-output '[range('"$WORKERS"')] | map(tostring)' /dev/null) >> $GITHUB_OUTPUT echo "workers="$(jq --slurp --compact-output '[range('"$WORKERS"')] | map(tostring)' /dev/null) >> $GITHUB_OUTPUT
generate-test-cycle: generate-test-cycle:
runs-on: ubuntu-22.04 runs-on: ubuntu-latest
needs: needs:
- update-initial-status - update-initial-status
defaults: defaults:
@@ -297,7 +297,7 @@ jobs:
e2e-tests/cypress/results/ e2e-tests/cypress/results/
report: report:
runs-on: ubuntu-22.04 runs-on: ubuntu-latest
needs: needs:
- test - test
- generate-build-variables - generate-build-variables
@@ -353,7 +353,7 @@ jobs:
make publish-report make publish-report
update-failure-final-status: update-failure-final-status:
runs-on: ubuntu-22.04 runs-on: ubuntu-latest
if: failure() || cancelled() if: failure() || cancelled()
needs: needs:
- generate-test-cycle - generate-test-cycle
@@ -373,7 +373,7 @@ jobs:
target_url: "${{ needs.generate-test-cycle.outputs.status_check_url }}" target_url: "${{ needs.generate-test-cycle.outputs.status_check_url }}"
update-success-final-status: update-success-final-status:
runs-on: ubuntu-22.04 runs-on: ubuntu-latest
if: success() if: success()
needs: needs:
- generate-test-cycle - generate-test-cycle

Просмотреть файл

@@ -1,4 +1,4 @@
FROM ubuntu:jammy-20230308@sha256:7a57c69fe1e9d5b97c5fe649849e79f2cfc3bf11d10bbd5218b4eb61716aebe6 FROM ubuntu:noble-20240605@sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30
# Setting bash as our shell, and enabling pipefail option # Setting bash as our shell, and enabling pipefail option
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -18,7 +18,8 @@ RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
ca-certificates \ ca-certificates \
curl \ curl \
mime-support \ media-types \
mailcap \
unrtf \ unrtf \
wv \ wv \
poppler-utils \ poppler-utils \
@@ -28,8 +29,8 @@ RUN apt-get update \
# Set mattermost group/user and download Mattermost # Set mattermost group/user and download Mattermost
RUN mkdir -p /mattermost/data /mattermost/plugins /mattermost/client/plugins \ RUN mkdir -p /mattermost/data /mattermost/plugins /mattermost/client/plugins \
&& addgroup -gid ${PGID} mattermost \ && groupadd --gid ${PGID} mattermost \
&& adduser -q --disabled-password --uid ${PUID} --gid ${PGID} --gecos "" --home /mattermost mattermost \ && useradd --uid ${PUID} --gid ${PGID} --comment "" --home-dir /mattermost mattermost \
&& curl -L $MM_PACKAGE | tar -xvz \ && curl -L $MM_PACKAGE | tar -xvz \
&& chown -R mattermost:mattermost /mattermost /mattermost/data /mattermost/plugins /mattermost/client/plugins && chown -R mattermost:mattermost /mattermost /mattermost/data /mattermost/plugins /mattermost/client/plugins