Merge pull request #4711 from Spredzy/pass-npmrc

e2e/cluster: Allow one to pass a npmrc config file

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-09-11 15:49:22 +00:00 committed by GitHub
commit 14ef06854d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View File

@ -1,5 +1,8 @@
FROM centos:7
ARG NPMRC_FILE=awx/ui/.npmrc
ENV NPMRC_FILE=${NPMRC_FILE}
RUN yum -y update && yum -y install epel-release && yum -y install https://centos7.iuscommunity.org/ius-release.rpm
RUN yum install -y \
@ -15,12 +18,9 @@ WORKDIR /awx
COPY awx/ui/package.json awx/ui/package.json
ARG NPM_REGISTRY=https://registry.npmjs.org
ENV NPM_REGISTRY=${NPM_REGISTRY}
COPY ${NPMRC_FILE} awx/ui/.npmrc
RUN npm config set registry ${NPM_REGISTRY}
RUN npm --prefix=awx/ui install
RUN npm --prefix=awx/ui config list && npm --prefix=awx/ui install
COPY awx/ui/test/e2e awx/ui/test/e2e

View File

@ -39,4 +39,4 @@ services:
AWX_E2E_CLUSTER_HOST: hub
AWX_E2E_CLUSTER_PORT: 4444
DBUS_SESSION_BUS_ADDRESS: /dev/null
NPM_REGISTRY: ${NPM_REGISTRY}
NPMRC_FILE: ${NPMRC_FILE}