Unverified Commit 6bbf5f65 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #13497 from nuwang/pin_docker_playbook 

[21.09] Pin corresponding playbook repo to sync with Galaxy release
parents acca3a97 3aa48334

.k8s_ci.Dockerfile

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ ARG STAGE1_BASE=python:3.7-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=v2.0.0



ARG GIT_COMMIT=unspecified

ARG BUILD_DATE=unspecified
@@ -34,6 +35,7 @@ FROM $STAGE1_BASE AS stage1 
ARG DEBIAN_FRONTEND=noninteractive

ARG SERVER_DIR

ARG GALAXY_PLAYBOOK_REPO

ARG GALAXY_PLAYBOOK_BRANCH



# Init Env

ENV LC_ALL=en_US.UTF-8
@@ -57,7 +59,7 @@ RUN set -xe; \ 
WORKDIR /tmp/ansible

RUN rm -rf *

ENV LC_ALL en_US.UTF-8

RUN git clone --depth 1 $GALAXY_PLAYBOOK_REPO galaxy-docker

RUN git clone --depth 1 --branch $GALAXY_PLAYBOOK_BRANCH $GALAXY_PLAYBOOK_REPO galaxy-docker

WORKDIR /tmp/ansible/galaxy-docker

RUN ansible-galaxy install -r requirements.yml -p roles --force-with-deps