Project

Profile

Help

Task #6477

Updated by dkliban@redhat.com about 1 year ago

The cloning of pulp-operator should be removed[0].

All the files, except for Containerfile, from the pulp-fedora31 repository[1] need to be added to the pulpcore/containers/images/pulp/container-assets/ directory[2].

Add an additional Dockerfile that has the following lines:

https://github.com/pulp/pulpcore/tree/72795671b822424dcc69e3d1a662b08786bb6ce0/containers/images/pulp/container-assets
https://github.com/dkliban/pulp-fedora31/blob/master/Containerfile#L2-L3
https://github.com/dkliban/pulp-fedora31/blob/master/Containerfile#L40-L43
https://github.com/dkliban/pulp-fedora31/blob/master/Containerfile#L47-L48
https://github.com/dkliban/pulp-fedora31/blob/master/Containerfile#L62-L80

The file references need to be updated to reflect their location in the pulpcore repository.

The FROM line should be prepended to the Dockerfile in the install.sh script. It should use the name and tag of the image that is build here[3].

After the first image is built, this new Dockerfile needs to be used to build a second image. We use 'docker build' to build images on Travis because it comes pre-installed on the VM.

All the code for configuring and starting the operator[4] needs to be removed.

All the commands from the single container blog post need to be added after the docker build command[5].

The settings file needs to be generated conditionally to include S3 settings or not.

A simple script that checks for a 200 response from http://localhost/pulp/api/v3/status/ needs to be added. It should try for up to 30 seconds. This script should replace the use of pulp-operator-check-and-wait.sh script from pulp-operator repo[6].

The show_log_and_return_non_zero function needs to have the loop removed and adjusted to just use 'docker logs' command on a single container.[7]

The CMD_STDIN_PREFIX command needs to be changed to use 'docker exec'[8]

The pulp_smash_config needs to be updated to use 'docker' transport.[9] (Also need to make pulp-smash understand that 'podman' and 'docker' are interchangeable.)


[0] https://github.com/pulp/pulpcore/blob/72795671b822424dcc69e3d1a662b08786bb6ce0/.travis/before_install.sh#L64-L74


[1] https://github.com/dkliban/pulp-fedora31


[2] https://github.com/pulp/pulpcore/tree/72795671b822424dcc69e3d1a662b08786bb6ce0/containers/images/pulp/container-assets


[3] https://github.com/pulp/pulpcore/blob/72795671b822424dcc69e3d1a662b08786bb6ce0/.travis/install.sh#L77


[4] https://github.com/pulp/pulpcore/blob/72795671b822424dcc69e3d1a662b08786bb6ce0/.travis/install.sh#L79-L144


[5] https://dkliban.github.io/pulpproject.org/2020/03/15/pulp-fedora31-single-container/


[6] https://github.com/pulp/pulpcore/blob/72795671b822424dcc69e3d1a662b08786bb6ce0/.travis/install.sh#L162


[7] https://github.com/pulp/pulpcore/blob/72795671b822424dcc69e3d1a662b08786bb6ce0/.travis/install.sh#L150


[8] https://github.com/pulp/pulpcore/blob/72795671b822424dcc69e3d1a662b08786bb6ce0/.travis/before_script.sh#L20


[9] https://github.com/pulp/pulpcore/blob/72795671b822424dcc69e3d1a662b08786bb6ce0/.travis/pulp-smash-config.json#L16

Back