FROM perforce/rocky9-base MAINTAINER Robert Cowham "rcowham@perforce.com" ADD setup_container.sh /tmp RUN /bin/bash -x /tmp/setup_container.sh ADD insecure_ssh_key.pub /tmp ADD insecure_ssh_key /tmp ADD setup_ssh.sh /tmp RUN /bin/bash -x /tmp/setup_ssh.sh # For SSH EXPOSE 22 RUN echo "Setting default memory limit..." && \ sh -c 'echo memory.limit=2048m >> /etc/systemd/system.conf' # Recommend resource allocation at runtime CMD ["echo", "For optimal performance, consider running the container with --cpus=2 --memory=2g --storage-opt size=20G"] USER perforce ADD files/reset_sdp.sh /p4/ ADD files/docker_entry.sh /p4/ ADD files/test_sdp.sh /p4/ ADD files/test_mkrep.sh /p4/ # From package.perforce.com: ADD files/perforce.rhel8.repo /tmp RUN sudo rpm --import https://package.perforce.com/perforce.pubkey RUN sudo cp -f /tmp/perforce.rhel8.repo /etc/yum.repos.d/perforce.repo RUN sudo yum install -y perforce-p4python3 USER root CMD ["/p4/docker_entry.sh"]
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#3 | 30864 | C. Thomas Tyler |
Reverting to older mechanisn by re-adding Dockerfile.rocky9.base and Dockerfile.rocky9.sdp files, but keeping the Dockerfile.rocky9 file in place as the path forward. The intent is to see if the old mechanism still works. Modified run_docker_tests.sh so it'll use the old 2-image mechanism if the *{os}.base and *.{os}.sdp files are found. Otherwise, if the {os} file is found, it'll use that. So both old and new styles are supported until fully deprecate one for the other. |
||
#2 | 30845 | Robert Cowham |
Base the podman/docker image on rocky9-ubi-init to get systemd This supports systemd within the container if run under podman instead of docker Remove centos7 docker files |
||
#1 | 30356 | C. Thomas Tyler |
Added Rocky 9 and Ubuntu 22 to test suite. Dropped CentOS 6. Changed default OS for tests from CentOS 7 to Rocky 9. Adapted to using podman for the test suite. Reduced minimum disk space requirement for testing from 1G to 10M. To be revisited: * Disabled OOM killer defenese feature and systemd due to compatibility issues with the test environment. * Disabled systemd by moving systemctl aside Enhanced build_docker_image.sh; added '-clean' option and added support for more platforms. Updated OS-specific packages as needed for all platforms, e.g. adding 'file' and 'rsync' utils as needed in Docker definitions. Added minimum performance recommendations for test containers in config. Updated env.sh utilities. This change test on: [X] centos7 [X] rocky8 [X] rocky9 [X] ubuntu20 [X] ubuntu22 #review-30357 @robert_cowham TO DO: * This builds using the official SDP test suite run manually on Tom's laptop. Next step: Get it working on our shiny new Jenkins Rocky 9 server machine. |