Skip to content

Commit 2cf27a9

Browse files
authored
Merge pull request #2287 from GaloisInc/T2286-Docker-revert-to-ubuntu-22.04
Dockerfiles: Revert from Ubuntu 24.04 to 22.04
2 parents 65e06ec + c88b0c8 commit 2cf27a9

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

saw-remote-api/Dockerfile

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM ubuntu:24.04 AS build
1+
# Note that we intentionally do not use ubuntu:24.04 or later pending a
2+
# resolution to https://github.com/coder/coder/issues/17316.
3+
FROM ubuntu:22.04 AS build
24
USER root
35
RUN apt-get update && \
46
apt-get install -y \
@@ -54,12 +56,12 @@ RUN case ${TARGETPLATFORM} in \
5456
printf "Unsupported architecture: %s\n" "${TARGETPLATFORM}" >&2 \
5557
exit 1 ;; \
5658
esac && \
57-
curl -o solvers.zip -sL "https://github.com/GaloisInc/what4-solvers/releases/download/snapshot-20250326/ubuntu-24.04-${WHAT4_SOLVERS_ARCH}-bin.zip"
59+
curl -o solvers.zip -sL "https://github.com/GaloisInc/what4-solvers/releases/download/snapshot-20250326/ubuntu-22.04-${WHAT4_SOLVERS_ARCH}-bin.zip"
5860
RUN unzip solvers.zip && rm solvers.zip && chmod +x *
5961
USER root
6062
RUN chown -R root:root /home/saw/rootfs
6163

62-
FROM ubuntu:24.04
64+
FROM ubuntu:22.04
6365
RUN apt-get update && \
6466
apt-get install -y libgmp10 libgomp1 libffi8 wget libncurses6 unzip libreadline-dev openjdk-11-jdk-headless zlib1g
6567
COPY --from=build /home/saw/rootfs /

saw/Dockerfile

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM ubuntu:24.04 AS build
1+
# Note that we intentionally do not use ubuntu:24.04 or later pending a
2+
# resolution to https://github.com/coder/coder/issues/17316.
3+
FROM ubuntu:22.04 AS build
24
USER root
35
RUN apt-get update && \
46
apt-get install -y \
@@ -55,12 +57,12 @@ RUN case ${TARGETPLATFORM} in \
5557
printf "Unsupported architecture: %s\n" "${TARGETPLATFORM}" >&2 \
5658
exit 1 ;; \
5759
esac && \
58-
curl -o solvers.zip -sL "https://github.com/GaloisInc/what4-solvers/releases/download/snapshot-20250326/ubuntu-24.04-${WHAT4_SOLVERS_ARCH}-bin.zip"
60+
curl -o solvers.zip -sL "https://github.com/GaloisInc/what4-solvers/releases/download/snapshot-20250326/ubuntu-22.04-${WHAT4_SOLVERS_ARCH}-bin.zip"
5961
RUN unzip solvers.zip && rm solvers.zip && chmod +x *
6062
USER root
6163
RUN chown -R root:root /home/saw/rootfs
6264

63-
FROM ubuntu:24.04
65+
FROM ubuntu:22.04
6466
RUN apt-get update && \
6567
apt-get install -y libgmp10 libgomp1 libffi8 wget libncurses6 libreadline-dev unzip zlib1g
6668
COPY --from=build /home/saw/rootfs /

0 commit comments

Comments
 (0)