Merge pull request #4005 from shanemcd/sdist-builder-node

Update node in AWX installer sdist builder

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

installer/roles/image_build/files/Dockerfile.sdist

@@ -7,11 +7,15 @@ RUN yum install -y bzip2 \
     gettext \
     git \
     make \
+    nodejs \
     python36-setuptools
 
-RUN curl --silent --location https://rpm.nodesource.com/setup_8.x | bash -
+# Use the distro provided npm to bootstrap our required version of node
-RUN yum install -y nodejs
+RUN npm install -g n
-RUN npm set progress=false
+RUN n 10.15.0
+RUN yum remove -y nodejs
+
+ENV PATH=/usr/local/n/versions/node/10.15.0/bin:$PATH
 
 WORKDIR "/awx"
 

installer/roles/image_build/tasks/main.yml

@@ -43,15 +43,18 @@
 
 - name: Build sdist builder image
   docker_image:
-    buildargs:
+    build:
-      http_proxy: "{{ http_proxy | default('') }}"
+      path: "{{ role_path }}/files"
-      https_proxy: "{{ https_proxy | default('') }}"
+      dockerfile: Dockerfile.sdist
-      no_proxy: "{{ no_proxy | default('') }}"
+      pull: no
-    path: "{{ role_path }}/files"
+      args:
-    dockerfile: Dockerfile.sdist
+        http_proxy: "{{ http_proxy | default('') }}"
+        https_proxy: "{{ https_proxy | default('') }}"
+        no_proxy: "{{ no_proxy | default('') }}"
     name: awx_sdist_builder
     tag: "{{ awx_version }}"
-    force: true
+    source: 'build'
+    force_source: true
   delegate_to: localhost
   when: use_container_for_build|default(true)|bool
 
@@ -183,29 +186,34 @@
 
 - name: Build base web image
   docker_image:
-    buildargs:
+    build:
-      http_proxy: "{{ http_proxy | default('') }}"
+      path: "{{ docker_base_path }}"
-      https_proxy: "{{ https_proxy | default('') }}"
+      dockerfile: Dockerfile
-      no_proxy: "{{ no_proxy | default('') }}"
+      pull: no
-    path: "{{ docker_base_path }}"
+      args:
-    dockerfile: Dockerfile
+        http_proxy: "{{ http_proxy | default('') }}"
+        https_proxy: "{{ https_proxy | default('') }}"
+        no_proxy: "{{ no_proxy | default('') }}"
     name: "{{ web_image }}"
     tag: "{{ awx_version }}"
-    force: yes
+    source: 'build'
+    force_source: yes
   delegate_to: localhost
 
 - name: Build base task image
   docker_image:
-    buildargs:
+    build:
-      http_proxy: "{{ http_proxy | default('') }}"
+      path: "{{ docker_base_path }}"
-      https_proxy: "{{ https_proxy | default('') }}"
+      dockerfile: Dockerfile.task
-      no_proxy: "{{ no_proxy | default('') }}"
+      pull: no
-    path: "{{ docker_base_path }}"
+      args:
-    dockerfile: Dockerfile.task
+        http_proxy: "{{ http_proxy | default('') }}"
+        https_proxy: "{{ https_proxy | default('') }}"
+        no_proxy: "{{ no_proxy | default('') }}"
     name: "{{ task_image }}"
     tag: "{{ awx_version }}"
-    pull: no
+    source: 'build'
-    force: yes
+    force_source: yes
   delegate_to: localhost
 
 - name: Tag task and web images as latest