Skip to content

Commit 6d6c42e

Browse files
committed
Update .NET dependency to 8.0 and simplify installation.
1 parent 213ab9f commit 6d6c42e

File tree

4 files changed

+5
-32
lines changed

4 files changed

+5
-32
lines changed

.github/scripts/ubuntu-22.04/setup_build.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,5 @@ sudo apt-get install --yes \
66
llvm-15-dev clang-15 libclang-15-dev \
77
gcc-11-plugin-dev thrift-compiler libthrift-dev \
88
default-jdk libssl-dev libgraphviz-dev libmagic-dev libgit2-dev exuberant-ctags doxygen \
9-
libldap2-dev libgtest-dev
10-
11-
wget https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
12-
sudo dpkg -i packages-microsoft-prod.deb
13-
sudo apt-get update
14-
sudo apt-get install -y apt-transport-https
15-
sudo apt-get update
16-
sudo apt-get install -y dotnet-sdk-6.0
9+
libldap2-dev libgtest-dev \
10+
dotnet-sdk-8.0

docker/dev/Dockerfile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ RUN set -x && apt-get update -qq \
2828
libsqlite3-dev \
2929
libssl-dev \
3030
llvm-15 clang-15 llvm-15-dev libclang-15-dev \
31+
dotnet-sdk-8.0 \
3132
thrift-compiler libthrift-dev \
3233
postgresql-server-dev-14 \
3334
postgresql-14 && \
@@ -49,14 +50,6 @@ RUN mkdir -p /etc/apt/keyrings && \
4950
apt-get clean && \
5051
rm -rf /var/lib/apt/lists/
5152

52-
# Install .NET 6.
53-
RUN wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \
54-
dpkg -i packages-microsoft-prod.deb && \
55-
apt-get update; \
56-
apt-get install -y apt-transport-https && \
57-
apt-get update && \
58-
apt-get install -y dotnet-sdk-6.0
59-
6053
# Build GTest.
6154
RUN cd /usr/src/googletest && \
6255
mkdir build && \

docker/runtime/Dockerfile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ RUN set -x && apt-get update -qq && \
5656
curl ca-certificates gnupg \
5757
wget \
5858
llvm-15 \
59+
dotnet-sdk-8.0 \
5960
libboost-filesystem-dev libboost-log-dev libboost-program-options-dev \
6061
default-jre \
6162
libgit2-dev \
@@ -81,14 +82,6 @@ RUN set -x && apt-get update -qq && \
8182
rm -rf /var/lib/apt/lists/ && \
8283
set +x
8384

84-
# Install .NET 8.
85-
RUN wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \
86-
dpkg -i packages-microsoft-prod.deb && \
87-
apt-get update; \
88-
apt-get install -y apt-transport-https && \
89-
apt-get update && \
90-
apt-get install -y dotnet-sdk-6.0
91-
9285
# Copy ODB install directory.
9386
COPY --from=builder /opt/odb /opt/odb
9487

docker/web/Dockerfile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN set -x && apt-get update -qq \
1919
&& apt-get install -qqy --no-install-recommends \
2020
wget \
2121
llvm-15 \
22+
dotnet-sdk-8.0 \
2223
libboost-filesystem-dev libboost-log-dev libboost-program-options-dev \
2324
libsqlite3-dev \
2425
postgresql-server-dev-14 \
@@ -50,14 +51,6 @@ RUN mkdir -p /etc/apt/keyrings && \
5051
apt-get clean && \
5152
rm -rf /var/lib/apt/lists/
5253

53-
# Install .NET 6.
54-
RUN wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \
55-
dpkg -i packages-microsoft-prod.deb && \
56-
apt-get update; \
57-
apt-get install -y apt-transport-https && \
58-
apt-get update && \
59-
apt-get install -y dotnet-sdk-6.0
60-
6154
# Copy ODB install directory.
6255
COPY --from=runtime /opt/odb /opt/odb
6356

0 commit comments

Comments
 (0)