Skip to content

Commit

Permalink
Update icu.net; Fix ubuntu 22.04 (#3171)
Browse files Browse the repository at this point in the history
  • Loading branch information
imnasnainaec authored Jun 28, 2024
1 parent 34aa08d commit 30509ca
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions: # added using https://github.com/step-security/secure-workflows

jobs:
test_build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
dotnet: ["8.0.x"]
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
actions: read # for github/codeql-action/init to get workflow details
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/autobuild to send a status report
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
# See https://docs.stepsecurity.io/harden-runner/getting-started/ for instructions on
# configuring harden-runner and identifying allowed endpoints.
Expand Down
4 changes: 2 additions & 2 deletions Backend/BackendFramework.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<PackageReference Include="Xabe.FFmpeg" Version="5.2.6"/>

<!-- SIL Maintained Dependencies. -->
<PackageReference Include="icu.net" Version="2.9.0" />
<PackageReference Include="Icu4c.Win.Full.Lib" Version="62.2.1-beta" />
<PackageReference Include="icu.net" Version="2.10.1-beta.4" />
<PackageReference Include="Icu4c.Win.Full.Lib" Version="62.2.3-beta" />
<PackageReference Include="SIL.Core" Version="14.1.1" />
<PackageReference Include="SIL.Core.Desktop" Version="14.1.1">
<NoWarn>NU1701</NoWarn>
Expand Down
11 changes: 7 additions & 4 deletions Backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,18 @@ ENV APP_FILES=${HOME}/.CombineFiles
# Install system dependencies.
RUN apt-get update \
&& apt-get install -y \
# icu.net dependency: libdl.so
libc6-dev ffmpeg \
ffmpeg \
&& rm -rf /var/lib/apt/lists/*

# Create the home directory for the new app user.
RUN mkdir -p $HOME

# Modify the existing app user to prevent login.
RUN usermod -s /sbin/nologin -c "Docker image user" app
# Setup app user and group to known UID/GID; no login.
RUN groupmod --gid 999 app
RUN usermod --uid 999 --gid app \
--shell /sbin/nologin \
--comment "Docker image user" \
app

## Set up application install directory.
RUN mkdir $APP_HOME && \
Expand Down
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,17 +95,15 @@ A rapid word collection tool. See the [User Guide](https://sillsdev.github.io/Th
git clone https://github.com/sillsdev/TheCombine.git
```

2. [Chocolatey][chocolatey]: (Windows only) a Windows package manager.
2. [Chocolatey][chocolatey] (Windows only): a Windows package manager.
3. [Node.js 20 (LTS)](https://nodejs.org/en/download/)

- On Windows, if using [Chocolatey][chocolatey]: `choco install nodejs-lts`
- On Ubuntu, follow
[this guide](https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions) using the
appropriate Node.js version.
4. [.NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet/8.0)

- On Ubuntu 20.02 or earlier, follow
[these instructions](https://docs.microsoft.com/en-us/dotnet/core/install/linux-ubuntu).

4. [.NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet/8.0)
5. [MongoDB](https://mongodb.com/docs/manual/administration/install-community/) provides instructions on how to install
the current release of MongoDB.

Expand All @@ -126,6 +124,11 @@ A rapid word collection tool. See the [User Guide](https://sillsdev.github.io/Th
7. [Python](#python): The Python section of this document has instructions for installing _Python 3_ on each of the
supported platforms and how to setup your virtual environment.
8. [FFmpeg](https://www.ffmpeg.org/download.html) and add its `/bin` to your PATH.
- On Mac:
- If using [homebrew](https://formulae.brew.sh/formula/ffmpeg): `brew install ffmpeg`
- If manually installing from the FFmpeg website, install both `ffmpeg` and `ffprobe`
9. [dotnet-format](https://github.com/dotnet/format): `dotnet tool update --global dotnet-format --version 5.1.250801`
10. [dotnet-reportgenerator](https://github.com/danielpalme/ReportGenerator)
`dotnet tool update --global dotnet-reportgenerator-globaltool --version 5.0.4`
Expand Down

0 comments on commit 30509ca

Please sign in to comment.