Merge pull request #279 from Azure/managed-externals

Managed Externals + Fixes & Enhancements

.dockerignore

@@ -1,7 +1,27 @@
+# Global
+.env
+Dockerfile
+Dockerfile.*
+
+# Root Project
+.github/
+.vscode/
+.VSCodeCounter/
+assets/
+deploy/
+docs/
+examples/
+tests/
+tools/
+/*.md
+.gitattributes
+.gitignore
+LICENSE
+
+# IPAM UI
 node_modules
 build
 dist
-.dockerignore
-Dockerfile
-Dockerfile.prod
+
+# IPAM Engine
 __pycache__

.gitignore

@@ -1,6 +1,18 @@
+# Global
 .env
-.VSCodeCounter
 .eslintcache
+
+# Root Project
+.VSCodeCounter
 NOTES.md
 TODO.md
 /logs
+
+# IPAM UI
+.eslintcache
+node_modules
+build
+dist
+
+# IPAM Engine
+__pycache__

Dockerfile.deb

@@ -11,18 +11,12 @@ ENV NPM_CONFIG_UPDATE_NOTIFIER=false
 # Set the Working Directory
 WORKDIR /tmp
 
-# Add `/app/node_modules/.bin` to $PATH
-ENV PATH /tmp/node_modules/.bin:$PATH
+# Copy UI Code
+COPY ./ui/. ./
 
 # Install UI Dependencies
-COPY ./ui/package.json ./
-COPY ./ui/package-lock.json ./
-
 RUN npm install
-RUN chmod 777 node_modules
-
-# Copy UI Code
-COPY ./ui/. ./
+RUN chmod 777 -R node_modules
 
 # Build IPAM UI
 RUN npm run build

Dockerfile.func

@@ -9,18 +9,12 @@ ENV NPM_CONFIG_UPDATE_NOTIFIER=false
 # Set the Working Directory
 WORKDIR /tmp
 
-# Add `/app/node_modules/.bin` to $PATH
-ENV PATH /tmp/node_modules/.bin:$PATH
+# Copy UI Code
+COPY ./ui/. ./
 
 # Install UI Dependencies
-COPY ./ui/package.json ./
-COPY ./ui/package-lock.json ./
-
 RUN npm install
-RUN chmod 777 node_modules
-
-# Copy UI Code
-COPY ./ui/. ./
+RUN chmod 777 -R node_modules
 
 # Build IPAM UI
 RUN npm run build

Dockerfile.rhel

@@ -11,19 +11,16 @@ ENV NPM_CONFIG_UPDATE_NOTIFIER=false
 # Set the Working Directory
 WORKDIR /tmp
 
-# Add `/app/node_modules/.bin` to $PATH
-ENV PATH /tmp/node_modules/.bin:$PATH
-
-# Install UI Dependencies
-COPY ./ui/package.json ./
-COPY ./ui/package-lock.json ./
-
-RUN npm install
-RUN chmod 777 node_modules
+# Switch to Root User
+USER root
 
 # Copy UI Code
 COPY ./ui/. ./
 
+# Install UI Dependencies
+RUN npm install
+RUN chmod 777 -R node_modules
+
 # Build IPAM UI
 RUN npm run build
 
@@ -43,6 +40,9 @@ WORKDIR /tmp
 # Switch to Root User
 USER root
 
+# Disable Subscription Manager YUM Plugin
+RUN sed -i s/enabled=./enabled=0/g /etc/yum/pluginconf.d/subscription-manager.conf
+
 # Install OpenSSH and set the password for root to "Docker!"
 RUN yum update -y
 RUN yum install -qq openssh-server -y \