Skip to content

Commit

Permalink
Revert "The Fedora rawhide container image no longer defines the cont…
Browse files Browse the repository at this point in the history
…ainer environment variable."

This reverts commit 458f9c3.

The container environment variable seems back in latest images.
  • Loading branch information
adelton committed May 15, 2024
1 parent 1a2bd9d commit b791455
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions Dockerfile.fedora-40
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ RUN systemctl mask rpc-gssd.service

# Container image which runs systemd
# debug: RUN test -f /etc/machine-id && ! test -s /etc/machine-id
# debug: RUN test -z "$container"
ENV container oci
# debug: RUN test "$container" = oci

# Establish reasonably low open files limit in the container
RUN echo "DefaultLimitNOFILE=1024" >> /etc/systemd/system.conf
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile.fedora-rawhide
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ RUN systemctl mask rpc-gssd.service

# Container image which runs systemd
# debug: RUN test -f /etc/machine-id && ! test -s /etc/machine-id
# debug: RUN test -z "$container"
ENV container oci
# debug: RUN test "$container" = oci

# Establish reasonably low open files limit in the container
RUN echo "DefaultLimitNOFILE=1024" >> /etc/systemd/system.conf
Expand Down

0 comments on commit b791455

Please sign in to comment.