Cleanup some container assets

[noissue]
pulp · Sep 19, 2023 · 0951496 · 0951496
1 parent 49be51b
commit 0951496
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 34 deletions.
diff --git a/images/Containerfile.core.base b/images/Containerfile.core.base
@@ -105,15 +105,11 @@ COPY images/assets/readyz.py /usr/bin/readyz.py
 COPY images/assets/route_paths.py /usr/bin/route_paths.py
 COPY images/assets/wait_on_postgres.py /usr/bin/wait_on_postgres.py
 COPY images/assets/wait_on_database_migrations.sh /usr/bin/wait_on_database_migrations.sh
-COPY images/assets/pulp-common-entrypoint.sh /pulp-common-entrypoint.sh
 COPY images/assets/pulp-api /usr/bin/pulp-api
 COPY images/assets/pulp-content /usr/bin/pulp-content
-COPY images/assets/pulp-resource-manager /usr/bin/pulp-resource-manager
 COPY images/assets/pulp-worker /usr/bin/pulp-worker
 
 # Need to precreate when running pulp as the pulp user
 RUN touch /var/log/galaxy_api_access.log && \
     chown pulp:pulp /var/log/galaxy_api_access.log && \
     chmod u+rw /var/log/galaxy_api_access.log
-
-ENTRYPOINT ["/pulp-common-entrypoint.sh"]
diff --git a/images/assets/pulp-common-entrypoint.sh b/images/assets/pulp-common-entrypoint.sh
diff --git a/images/assets/pulp-resource-manager b/images/assets/pulp-resource-manager
diff --git a/images/assets/pulp-worker b/images/assets/pulp-worker
@@ -3,6 +3,5 @@
 /usr/bin/wait_on_postgres.py
 /usr/bin/wait_on_database_migrations.sh
 
-export PULP_SETTINGS=/etc/pulp/settings.py
 export PATH=/usr/local/bin:/usr/bin/
 exec pulpcore-worker
diff --git a/images/assets/readyz.py b/images/assets/readyz.py
@@ -48,7 +48,7 @@ def is_content_healthy(path):
 The cmdline value for this PID looks like:
 ```
 # pip installation
-gunicorn: master \[pulp-{content,api,worker,resource-manager}\]
+gunicorn: master \[pulp-{content,api}\]
 ```
 OR
 ```

diff --git a/images/pulp-minimal/stable/Containerfile.core b/images/pulp-minimal/stable/Containerfile.core
@@ -25,6 +25,10 @@ RUN pip3 install --upgrade \
   pulp-ostree${PULP_OSTREE_VERSION} && \
   rm -rf /root/.cache/pip
 
+# Prevent pip-installed /usr/local/bin/pulp-content from getting run instead of
+# our /usr/bin/pulp-content script.
+RUN rm -r /usr/local/bin/pulp-content
+
 USER pulp:pulp
 RUN PULP_STATIC_ROOT=/var/lib/operator/static/ PULP_CONTENT_ORIGIN=localhost \
        /usr/local/bin/pulpcore-manager collectstatic --clear --noinput --link