diff --git a/docs/development/minikube.md b/docs/development/minikube.md index c7097d58c5..876b63a2ba 100644 --- a/docs/development/minikube.md +++ b/docs/development/minikube.md @@ -35,16 +35,7 @@ For the following playbooks to work, you will need to: $ pip install openshift ``` -If you are not changing any code in the operator itself, git checkout the latest version from https://github.com/ansible/awx-operator/releases, and then run the following command (from the awx-operator repo): - -``` -$ alias kubectl="minikube kubectl --" -$ export NAMESPACE=my-namespace -$ kubectl create namespace $NAMESPACE -$ kubectl config set-context --current --namespace=$NAMESPACE -$ make deploy - -``` +If you are not changing any code in the operator itself, git checkout the latest version from https://github.com/ansible/awx-operator/releases, and then follow the instructions in the awx-operator [README](https://github.com/ansible/awx-operator#basic-install). If making changes to the operator itself, run the following command in the root of the awx-operator repo. If not, continue to the next section. @@ -57,7 +48,6 @@ $ export IMAGE_TAG_BASE=quay.io//awx-operator $ export VERSION= $ make docker-build $ docker push ${IMAGE_TAG_BASE}:${VERSION} -$ make deploy ``` ## Deploy AWX into Minikube using the AWX Operator diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 index ccd4a33d7c..232fa60234 100644 --- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 +++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 @@ -152,7 +152,7 @@ RUN dnf -y install \ unzip && \ npm install -g n && n 16.13.1 && npm install -g npm@8.5.0 && dnf remove -y nodejs -RUN pip3 install black git+https://github.com/coderanger/supervisor-stdout +RUN pip3 install black git+https://github.com/coderanger/supervisor-stdout setuptools-scm # This package randomly fails to download. # It is nice to have in the dev env, but not necessary. @@ -246,6 +246,7 @@ RUN for dir in \ /etc/containers \ /var/lib/awx/.config/containers \ /var/lib/awx/.config/cni \ + /var/lib/awx/.local \ /var/lib/awx/venv \ /var/lib/awx/venv/awx/bin \ /var/lib/awx/venv/awx/lib/python3.9 \