From 03d59e1616e844aaa845c3b7fe77749fe52c8dd4 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Fri, 4 Oct 2019 10:42:32 -0400 Subject: [PATCH] Tune webpack config and add Dockerfile Add Dockerfile for running containerized dev server. Update webpack config to make dev server available over exposed docker port. --- awx/ui_next/.npmrc | 0 awx/ui_next/Dockerfile | 20 ++++++++++++++++++++ awx/ui_next/README.md | 13 +++++++++++++ awx/ui_next/webpack.config.js | 3 ++- 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 awx/ui_next/.npmrc create mode 100644 awx/ui_next/Dockerfile diff --git a/awx/ui_next/.npmrc b/awx/ui_next/.npmrc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/awx/ui_next/Dockerfile b/awx/ui_next/Dockerfile new file mode 100644 index 0000000000..bbf2ef65f9 --- /dev/null +++ b/awx/ui_next/Dockerfile @@ -0,0 +1,20 @@ +FROM node:10 +ARG NPMRC_FILE=.npmrc +ENV NPMRC_FILE=${NPMRC_FILE} +ARG TARGET_HOST='awx' +ENV TARGET_HOST=${TARGET_HOST} +ARG TARGET_PORT=8043 +ENV TARGET_PORT=${TARGET_PORT} +WORKDIR /ui_next +ADD build build +ADD dist dist +ADD images images +ADD package.json package.json +ADD package-lock.json package-lock.json +COPY ${NPMRC_FILE} .npmrc +RUN npm install +ADD babel.config.js babel.config.js +ADD webpack.config.js webpack.config.js +ADD src src +EXPOSE 3001 +CMD [ "npm", "run", "start" ] diff --git a/awx/ui_next/README.md b/awx/ui_next/README.md index db309aa419..59bf37714e 100644 --- a/awx/ui_next/README.md +++ b/awx/ui_next/README.md @@ -27,3 +27,16 @@ To run a single test (in this case the login page test): * `npm test -- src/screens/Login/Login.test.jsx` **note:** Once the test watcher is up and running you can hit `a` to run all the tests + + +## CI Container + +To run: + +```shell +cd awx/awx/ui_next +docker build -t awx-ui-next . +docker run --name tools_ui_next_1 --network tools_default --link 'tools_awx_1:awx' -e TARGET_HOST=awx -p '3001:3001' --rm -v $(pwd)/src:/ui_next/src awx-ui-next +``` + +**note:** This is for CI, test systems, zuul, etc. For local development, see [usage](https://github.com/ansible/awx/blob/devel/awx/ui_next/README.md#usage) diff --git a/awx/ui_next/webpack.config.js b/awx/ui_next/webpack.config.js index f45e2f5e5c..e726078ffb 100644 --- a/awx/ui_next/webpack.config.js +++ b/awx/ui_next/webpack.config.js @@ -80,7 +80,8 @@ module.exports = { hot: true, inline: true, stats: 'minimal', - host: '127.0.0.1', + host: '0.0.0.0', + disableHostCheck: true, https: true, port: 3001, clientLogLevel: 'none',