Merge pull request #15647 from galaxyproject/nuwang-patch-dockerfile

Changes to match latest playbook
galaxyproject · Feb 24, 2023 · dae5069 · dae5069
2 parents 109a389 + afe9a9f
commit dae5069
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/.k8s_ci.Dockerfile b/.k8s_ci.Dockerfile
@@ -22,7 +22,7 @@ ARG STAGE1_BASE=python:3.10-slim
 ARG FINAL_STAGE_BASE=$STAGE1_BASE
 ARG GALAXY_USER=galaxy
 ARG GALAXY_PLAYBOOK_REPO=https://github.com/galaxyproject/galaxy-docker-k8s
-ARG GALAXY_PLAYBOOK_BRANCH=v3.0.0
+ARG GALAXY_PLAYBOOK_BRANCH=v4.0.0
 
 ARG GIT_COMMIT=unspecified
 ARG BUILD_DATE=unspecified
@@ -74,8 +74,6 @@ ARG SERVER_DIR
 
 RUN ansible-playbook -i localhost, playbook.yml -v -e "{galaxy_build_client: false}" -e galaxy_virtualenv_command=virtualenv
 
-RUN cat /galaxy/server/lib/galaxy/dependencies/conditional-requirements.txt | grep psycopg2-binary | xargs /galaxy/server/.venv/bin/pip install
-
 # Remove build artifacts + files not needed in container
 WORKDIR $SERVER_DIR
 # Save commit hash of HEAD before zapping git folder