From 0e5abb5fa34cebf214adeb1db7b28be0ae92e897 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Wed, 11 Sep 2019 16:12:50 +0200 Subject: [PATCH 1/2] Revert "add npm registry arg" This reverts commit 844f3fde724a53c87476f69452480cfbb082a2fc. --- awx/ui/test/e2e/cluster/Dockerfile | 5 ----- awx/ui/test/e2e/cluster/docker-compose.yml | 1 - 2 files changed, 6 deletions(-) diff --git a/awx/ui/test/e2e/cluster/Dockerfile b/awx/ui/test/e2e/cluster/Dockerfile index ce4364ae80..64bfa4f7c7 100644 --- a/awx/ui/test/e2e/cluster/Dockerfile +++ b/awx/ui/test/e2e/cluster/Dockerfile @@ -15,11 +15,6 @@ WORKDIR /awx COPY awx/ui/package.json awx/ui/package.json -ARG NPM_REGISTRY=https://registry.npmjs.org -ENV NPM_REGISTRY=${NPM_REGISTRY} - -RUN npm config set registry ${NPM_REGISTRY} - RUN npm --prefix=awx/ui install COPY awx/ui/test/e2e awx/ui/test/e2e diff --git a/awx/ui/test/e2e/cluster/docker-compose.yml b/awx/ui/test/e2e/cluster/docker-compose.yml index 72e1f5828d..3c2aa5ce7e 100644 --- a/awx/ui/test/e2e/cluster/docker-compose.yml +++ b/awx/ui/test/e2e/cluster/docker-compose.yml @@ -39,4 +39,3 @@ services: AWX_E2E_CLUSTER_HOST: hub AWX_E2E_CLUSTER_PORT: 4444 DBUS_SESSION_BUS_ADDRESS: /dev/null - NPM_REGISTRY: ${NPM_REGISTRY} From 2ea280bbafb51728a276b07dff883156116d3d14 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Wed, 11 Sep 2019 16:15:50 +0200 Subject: [PATCH 2/2] Dockerfile: Allow one to pass a npmrc file --- awx/ui/test/e2e/cluster/Dockerfile | 7 ++++++- awx/ui/test/e2e/cluster/docker-compose.yml | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/awx/ui/test/e2e/cluster/Dockerfile b/awx/ui/test/e2e/cluster/Dockerfile index 64bfa4f7c7..73cbe3906e 100644 --- a/awx/ui/test/e2e/cluster/Dockerfile +++ b/awx/ui/test/e2e/cluster/Dockerfile @@ -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,7 +18,9 @@ WORKDIR /awx COPY awx/ui/package.json awx/ui/package.json -RUN npm --prefix=awx/ui install +COPY ${NPMRC_FILE} awx/ui/.npmrc + +RUN npm --prefix=awx/ui config list && npm --prefix=awx/ui install COPY awx/ui/test/e2e awx/ui/test/e2e diff --git a/awx/ui/test/e2e/cluster/docker-compose.yml b/awx/ui/test/e2e/cluster/docker-compose.yml index 3c2aa5ce7e..bd2a0fac05 100644 --- a/awx/ui/test/e2e/cluster/docker-compose.yml +++ b/awx/ui/test/e2e/cluster/docker-compose.yml @@ -39,3 +39,4 @@ services: AWX_E2E_CLUSTER_HOST: hub AWX_E2E_CLUSTER_PORT: 4444 DBUS_SESSION_BUS_ADDRESS: /dev/null + NPMRC_FILE: ${NPMRC_FILE}