ci(docker updates): docker updates

docker updates
softrams · Nov 30, 2020 · 1bd423d · 1bd423d
1 parent cc7dcf6
commit 1bd423d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 20 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM softramsdocker/bulwark-base:6.2.5
+FROM softramsdocker/bulwark-base:latest
 
 # Environment Arguments for Bulwark
 ARG MYSQL_USER

diff --git a/bulwark_base/Dockerfile b/bulwark_base/Dockerfile
@@ -6,9 +6,6 @@ FROM alpine:3.12.0
 
 # Environmental Items
 ENV NODE_VERSION=14.9.0 \
-    NPM_VERSION=6.14.8 \
-    ANGULAR_VERSION=11.0.0 \
-    NPM_CONFIG_LOGLEVEL=info \
     TYPESCRIPT_VERSION=4.0.2 \
     PUPPETEER_VERSION=5.2.1 \
     PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
@@ -63,21 +60,6 @@ RUN rm -f "node-v$NODE_VERSION" \
   && node --version \
   && npm --version
 
-# Install NPM
-# RUN npm install -g npm@$NPM_VERSION
-
-# Install Angular
-# RUN npm install -g @angular/cli@$ANGULAR_VERSION --unsafe-perm
-
-# Install Typescript
-# RUN npm install -g typescript@$TYPESCRIPT_VERSION
-
-# Install Angular Build DevKit
-# RUN npm install -g @angular-devkit/build-angular
-
-# Install Puppeteer
-# RUN npm install -g puppeteer@$PUPPETEER_VERSION
-
 # Setup for launch control of Bulwark
 WORKDIR /
 COPY bulwark-entrypoint /usr/local/bin/

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   bulwark:
-    image: softramsdocker/bulwark:6.2.5
+    image: softramsdocker/bulwark:latest
     container_name: bulwark
     environment:
       MYSQL_USER: '${MYSQL_USER}'