Skip to content

Commit 00298dc

Browse files
kfriedbergerkfriedberger
authored
Merge pull request #423 from sosy-lab/414-docker-images-not-working-on-ubuntu-2410
Use Podman for the build container
2 parents b55c76c + d2568bb commit 00298dc

File tree

6 files changed

+10
-32
lines changed

6 files changed

+10
-32
lines changed

‎docker/buildUbuntu1804.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@
44
# an API wrapper for a collection of SMT solvers:
55
# https://github.com/sosy-lab/java-smt
66
#
7-
# SPDX-FileCopyrightText: 2021 Dirk Beyer <https://www.sosy-lab.org>
7+
# SPDX-FileCopyrightText: 2025 Dirk Beyer <https://www.sosy-lab.org>
88
#
99
# SPDX-License-Identifier: Apache-2.0
1010

11-
docker build -t registry.gitlab.com/sosy-lab/software/java-smt/develop:ubuntu1804 - < ubuntu1804.Dockerfile
11+
podman build -t registry.gitlab.com/sosy-lab/software/java-smt/develop:ubuntu1804 - < ubuntu1804.Dockerfile
1212

1313
# For pushing to Gitlab registry, please create your personal access token:
1414
# https://gitlab.com/-/user_settings/personal_access_tokens
1515
# with read and write rights to the Gitlab registry (full API access is not required)
1616
#
1717
# Please use the following commands to push the build image to Gitlab:
18-
# docker login registry.gitlab.com
19-
# docker push registry.gitlab.com/sosy-lab/software/java-smt/develop:ubuntu1804
20-
18+
# podman login registry.gitlab.com
19+
# podman push registry.gitlab.com/sosy-lab/software/java-smt/develop:ubuntu1804

‎docker/buildUbuntu2204.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@
44
# an API wrapper for a collection of SMT solvers:
55
# https://github.com/sosy-lab/java-smt
66
#
7-
# SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
7+
# SPDX-FileCopyrightText: 2025 Dirk Beyer <https://www.sosy-lab.org>
88
#
99
# SPDX-License-Identifier: Apache-2.0
1010

11-
docker build -t registry.gitlab.com/sosy-lab/software/java-smt/develop:ubuntu2204 - < ubuntu2204.Dockerfile
11+
podman build -t registry.gitlab.com/sosy-lab/software/java-smt/develop:ubuntu2204 - < ubuntu2204.Dockerfile
1212

1313
# For pushing to Gitlab registry, please create your personal access token:
1414
# https://gitlab.com/-/user_settings/personal_access_tokens
1515
# with read and write rights to the Gitlab registry (full API access is not required)
1616
#
1717
# Please use the following commands to push the build image to Gitlab:
18-
# docker login registry.gitlab.com
19-
# docker push registry.gitlab.com/sosy-lab/software/java-smt/develop:ubuntu2204
20-
18+
# podman login registry.gitlab.com
19+
# podman push registry.gitlab.com/sosy-lab/software/java-smt/develop:ubuntu2204

‎docker/runUbuntu1804.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
# JavaSMT and all solver files are located in the directory "workspace".
1313
WORKSPACE=$HOME/workspace
1414

15-
docker run -it \
15+
podman run -it \
1616
--mount type=bind,source=${WORKSPACE},target=/workspace \
1717
--workdir /workspace/java-smt \
18-
--user $(id -u ${USER}):$(id -g ${USER}) \
1918
registry.gitlab.com/sosy-lab/software/java-smt/develop:ubuntu1804

‎docker/runUbuntu2204.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
# JavaSMT and all solver files are located in the directory "workspace".
1313
WORKSPACE=$HOME/workspace
1414

15-
docker run -it \
15+
podman run -it \
1616
--mount type=bind,source=${WORKSPACE},target=/workspace \
1717
--workdir /workspace/java-smt \
18-
--user $(id -u ${USER}):$(id -g ${USER}) \
1918
registry.gitlab.com/sosy-lab/software/java-smt/develop:ubuntu2204

‎docker/ubuntu1804.Dockerfile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,5 @@ RUN wget https://gmplib.org/download/gmp/gmp-6.2.1.tar.lz \
6767
&& make install \
6868
&& cd --
6969

70-
# Add the user "developer" with UID:1000, GID:1000, home at /developer.
71-
# This allows to map the docker-internal user to the local user 1000:1000 outside of the container.
72-
# This avoids to have new files created with root-rights.
73-
RUN groupadd -r developer -g 1000 \
74-
&& useradd -u 1000 -r -g developer -m -d /developer -s /sbin/nologin -c "JavaSMT Development User" developer \
75-
&& chmod 755 /developer
76-
77-
USER developer
78-
7970
# JNI is not found when compiling Boolector in the image, so we need to set JAVA_HOME
8071
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/

‎docker/ubuntu2204.Dockerfile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,5 @@ RUN wget https://download.java.net/openjdk/jdk11/ri/openjdk-11+28_windows-x64_bi
7979
&& unzip openjdk-11+28_windows-x64_bin.zip \
8080
&& rm openjdk-11+28_windows-x64_bin.zip
8181

82-
# Add the user "developer" with UID:1000, GID:1000, home at /developer.
83-
# This allows to map the docker-internal user to the local user 1000:1000 outside of the container.
84-
# This avoids to have new files created with root-rights.
85-
RUN groupadd -r developer -g 1000 \
86-
&& useradd -u 1000 -r -g developer -m -d /developer -s /sbin/nologin -c "JavaSMT Development User" developer \
87-
&& chmod 755 /developer
88-
89-
USER developer
90-
9182
# JNI is not found when compiling Boolector in the image, so we need to set JAVA_HOME
9283
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/

0 commit comments

Comments
 (0)