Merge branch 'luke.j.cervantes-development-patch-36001' into 'development'

Updated per #1 (comment 276985)

See merge request !17

Dockerfile

@@ -23,7 +23,7 @@ ENV PYTHON_VERSION=3.6 \
 ENV PROMPT_COMMAND=". /usr/bin/aap && unset PROMPT_COMMAND"
 
 # Copy extra files to the image.
-COPY ./root /
+COPY ./scripts /usr/bin
 RUN chmod a+x /usr/bin/container-entrypoint && \
     chmod a+x /usr/bin/fix-permissions && \
     chmod a+x /usr/bin/rpm-file-permissions && \
@@ -32,7 +32,7 @@ RUN chmod a+x /usr/bin/container-entrypoint && \
     chmod a+x /usr/bin/aap
 
 # Install packages
-RUN INSTALL_PKGS="vim-enhanced rsync iputils bind-utils git python36 python36-devel python3-setuptools python3-pip python3-virtualenv" && \
+RUN INSTALL_PKGS="vim-enhanced rsync iputils bind-utils git python36 python36-devel python3-setuptools python3-pip python3-virtualenv jq" && \
     yum -y update-minimal --setopt=tsflags=nodocs --security && \
     yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
     yum -y remove vim-minimal && \
@@ -55,9 +55,6 @@ RUN rpm --import /tmp/key.asc && \
     rm -f /tmp/key.asc && \
     rm -f /tmp/mongodb-org-shell-4.4.4-1.el8.x86_64.rpm
 
-# Install jq (to parse openshift api query results)
-RUN yum -y install jq
-
 # # Instal helm
 COPY helm-v3.5.2-linux-amd64.tar.gz /tmp/helm-v3.5.2-linux-amd64.tar.gz
 RUN tar -zxvf /tmp/helm-v3.5.2-linux-amd64.tar.gz && \

README.md

-# <application name>
+# AAP Command Line Interface
+_Deploy this container to your project and open a shell in it to gain access to command line tools that help you manage your project._
 
-Project template for all Iron Bank container repositories.
\ No newline at end of file
+![AAP CLI](images/aap-cli-screenshot.png "AAP CLI")
+
+## To use
+This project is used to build the aap-cli image. To use it, add the container to your project by referencing the built image from a container repository (like Nexus).
+TBD: Add from the AAP Catalog (look for AAP CLI)
+
+## Tools included
+- `oc` (OpenShift CLI tool, v4.3.14)
+- `git` (v2.18.4)
+- `python` (v3.6)
+- `mongo` shell (v3.6.18)
+
+## Ideas, things you can do with this
+- Just use your browser... stop struggling with configuration of client-based shells like `git-bash` or Windows `cmd.exe`
+- Use command line and text-based tools to organize your work and keep track of it with git SCM
+- Perform troubleshooting and testing of other pods in your project using tools like `curl` and `pytest`
+
+## For help
+- Find support in NAVAIR Fusion chat channel [#aap_support](https://chat.navair1.navy.mil/channel/aap_support)
+- Check out the [AAP Wiki](https://wiki.navair1.navy.mil/display/Analytics/Advanced+Analytics+Platform) for user guides and further support

hardening_manifest.yaml

@@ -54,13 +54,6 @@ resources:
     validation:
       type: "sha256" # supported: sha256, sha512
       value: "01b317c506f8b6ad60b11b1dc3f093276bb703281cb1ae01132752253ec706a2" # must be lowercase
-  - url: "http://www.rpmfind.net/linux/centos/8.3.2011/AppStream/x86_64/os/Packages/perl-5.30.1-451.module_el8.3.0+406+78614513.x86_64.rpm"
-    filename: "perl-5.30.1-451.module_el8.3.0+406+78614513.x86_64.rpm" 
-    validation:
-      type: "sha256" # supported: sha256, sha512
-      value: "5af6605a7cfb477a60132992e679a4b5502c71b4636e8839cdba5f8ec580f368" # must be lowercase
-
-
 
 # List of project maintainers
 maintainers:

root/usr/bin/container-entrypoint

-#!/bin/bash
-
-# temp: hard coding "hero" as container username (todo: fix to use env vars for username and homedir)
-if [ `id -u` -ge 1 ]; then
-  echo "hero:x:`id -u`:`id -g`:here:/opt/app-root:/bin/bash" >> /etc/passwd
-fi
-
-exec "$@"
-

scripts/container-entrypoint

+#!/bin/bash
+
+exec "$@"
+