Skip to content

Commit 5ba84fc

Browse files
authored
chore: update Ubuntu image from 20.04 to 22.04 (#977)
* Update ubuntu from 20.04 to 22.04 for workflow * Update ubuntu from 20.04 to 22.04 for Dockerfile * Update golang version * Fix Dockerfile
1 parent e99dbea commit 5ba84fc

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/code-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
sonar:
1111
name: SonarScanner
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313
timeout-minutes: 120
1414
permissions:
1515
contents: read

flutter/android/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:22.04
22

33
# Without DEBIAN_FRONTEND=noninteractive arg apt-get waits for user input.
44
# Docker desktop shows all previously defined args for each of the commands,

tools/formatter/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
# This Docker image is used to run code formatter
1717

18-
FROM ubuntu:20.04
18+
FROM ubuntu:22.04
1919

2020
ENV DEBIAN_FRONTEND="noninteractive"
2121

@@ -33,9 +33,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
3333

3434
# Add buildifier
3535
RUN apt-get update && apt-get install -y --no-install-recommends \
36-
golang-1.16-go
37-
ENV PATH=$PATH:/usr/lib/go-1.16/bin:~/go/bin
38-
RUN /usr/lib/go-1.16/bin/go get github.com/bazelbuild/buildtools/[email protected]
36+
golang-1.23-go
37+
ENV PATH=$PATH:/usr/lib/go-1.23/bin:~/go/bin
38+
RUN /usr/lib/go-1.23/bin/go install github.com/bazelbuild/buildtools/[email protected]
3939
RUN cp ~/go/bin/buildifier ${FORMATTER_HOME}/
4040

4141
# Add CLang formatter
@@ -79,9 +79,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends clang libpython
7979
ENV PATH=$PATH:/usr/local/swift/bin
8080
ARG BUILDARCH
8181
RUN if [ "$BUILDARCH" = "amd64" ]; then \
82-
SWIFT_URL=https://download.swift.org/swift-5.8-release/ubuntu2004/swift-5.8-RELEASE/swift-5.8-RELEASE-ubuntu20.04.tar.gz; \
82+
SWIFT_URL=https://download.swift.org/swift-5.10.1-release/ubuntu2204/swift-5.10.1-RELEASE/swift-5.10.1-RELEASE-ubuntu22.04.tar.gz; \
8383
elif [ "$BUILDARCH" = "arm64" ]; then \
84-
SWIFT_URL=https://download.swift.org/swift-5.8-release/ubuntu2004-aarch64/swift-5.8-RELEASE/swift-5.8-RELEASE-ubuntu20.04-aarch64.tar.gz; \
84+
SWIFT_URL=https://download.swift.org/swift-5.10.1-release/ubuntu2204-aarch64/swift-5.10.1-RELEASE/swift-5.10.1-RELEASE-ubuntu22.04-aarch64.tar.gz; \
8585
else \
8686
echo "Unknown architecture"; exit 1; \
8787
fi && \

0 commit comments

Comments
 (0)