simplified docker builds

Dockerfile

@@ -1,20 +1,12 @@
-# +-+-+-+-+-+ +-+-+-+-+-+
+# Build
-# |B|u|i|l|d| |S|t|a|g|e|
-# +-+-+-+-+-+ +-+-+-+-+-+
 FROM node:lts-alpine as build-stage
 WORKDIR /app
 COPY package*.json ./
 RUN npm install
 COPY . .
 RUN npm run build
-# For testing purposes, it's easy to run http-server on lts-alpine such as continuing from here:
-#       RUN npm install -g http-server
-#       EXPOSE 8080
-#       CMD [ "http-server", "dist" ]
 
-# +-+-+-+-+-+-+-+-+-+-+ +-+-+-+-+-+
+# Production stage
-# |P|r|o|d|u|c|t|i|o|n| |S|t|a|g|e|
-# +-+-+-+-+-+-+-+-+-+-+ +-+-+-+-+-+
 FROM nginx:stable-alpine as production-stage
 COPY --from=build-stage /app/dist /usr/share/nginx/html
 EXPOSE 80

README.md

@@ -28,16 +28,16 @@ Fork it & add more scripts in [application.yaml](src/application/application.yam
 
 ## Commands
 
-- Setup and run
+- Project setup: `npm install`
-  - For development:
+- Testing
-    - `npm install` to project setup.
+  - Run unit tests: `npm run test:unit`
-    - `npm run serve` to compile & hot-reload for development.
+  - Lint: `npm run lint`
-  - Production (using Docker):
+- **Webpage**
-    - Build `docker build -t undergroundwires/privacy.sexy .`
+  - Development: `npm run serve` to compile & hot-reload for development.
-    - Run `docker run -it -p 8080:8080 --rm --name privacy.sexy-1 undergroundwires/privacy.sexy`
+  - Production: `npm run build` to prepare files for distribution.
-- Prepare for production: `npm run build`
+  - Or run using Docker:
-- Run tests: `npm run test:unit`
+    1. Build: `docker build -t undergroundwires/privacy.sexy:0.4.8 .`
-- Lint and fix files: `npm run lint`
+    2. Run: `docker run -it -p 8080:80 --rm --name privacy.sexy-0.4.8 undergroundwires/privacy.sexy:0.4.8`
 
 ## Architecture
 

src/application/application.yaml

@@ -298,14 +298,23 @@ actions:
                 recommended: false
                 docs: https://www.windowslifestyle.com/reset-data-usage-tool-reset-network-data-usage-windows-10/
                 code: |-
-                    SET was_running=0
+                    setlocal EnableDelayedExpansion 
-                    net stop DPS && was_running=1
+                        SET /A dps_service_running=0
-                    echo %was_running%
+                        SC queryex "DPS"|Find "STATE"|Find /v "RUNNING">Nul||(
-                    del /F /S /Q /A "%windir%\System32\sru*"
+                            SET /A dps_service_running=1
-                    IF NOT %was_running% == 0 (
+                            net stop DPS
-                        net start DPS
                         )
                         
+                        REM del /F /S /Q /A "%windir%\System32\sru*"
+                        
+                        IF !dps_service_running! == 1 (
+                            echo "Was running"
+                            net start DPS
+                        ) ELSE (
+                            echo "Was not running"
+                        )
+                    endlocal
+
     -
         category: Disable OS data collection
         children:
@@ -373,6 +382,10 @@ actions:
                 code: |-
                     reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Device Metadata" /v "PreventDeviceMetadataFromNetwork" /t REG_DWORD /d 1 /f
                     reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Device Metadata" /v "PreventDeviceMetadataFromNetwork" /t REG_DWORD /d 1 /f
+            -
+                name: Disable active prompting (pings to MSFT NCSI server)
+                recommend: false
+                code: reg add "HKLM\SYSTEM\CurrentControlSet\Services\NlaSvc\Parameters\Internet" /v "EnableActiveProbing" /t REG_DWORD /d "0" /f
             -
                 name: Opt out from Windows privacy consent
                 recommend: true
@@ -538,7 +551,6 @@ actions:
                         name: Deny app access to text/mms 
                         recommend: true
                         code: reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\DeviceAccess\Global\{992AFA70-6F47-4148-B3E9-3003349C1548}" /t REG_SZ /v "Value" /d DENY /f
-                           
             -
                 name: Deny location access
                 recommend: true
@@ -868,6 +880,10 @@ actions:
                     reg add "HKCU\SOFTWARE\Policies\Microsoft\Office\15.0\osm" /v "EnableUpload" /t REG_DWORD /d 0 /f 
                     reg add "HKCU\SOFTWARE\Policies\Microsoft\Office\16.0\osm" /v "Enablelogging" /t REG_DWORD /d 0 /f 
                     reg add "HKCU\SOFTWARE\Policies\Microsoft\Office\16.0\osm" /v "EnableUpload" /t REG_DWORD /d 0 /f
+                    schtasks /change /TN "Microsoft\Office\Office ClickToRun Service Monitor" /DISABLE
+                    schtasks /change /TN "Microsoft\Office\OfficeTelemetryAgentFallBack2016" /DISABLE
+                    schtasks /change /TN "Microsoft\Office\OfficeTelemetryAgentLogOn2016" /DISABLE
+                    sc stop "ClickToRunSvc" & sc config "ClickToRunSvc" start= disabled
             -
                 category: Configure browsers
                 children: 
@@ -1130,7 +1146,11 @@ actions:
             -
                 name: Disable Windows Defender 
                 recommend: false
-                code: reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender" /v DisableAntiSpyware /t REG_DWORD /d 1 /f
+                code: |
+                    netsh advfirewall set allprofiles state off
+                    reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender" /v DisableAntiSpyware /t REG_DWORD /d 1 /f
+                    reg add "HKLM\SYSTEM\CurrentControlSet\Services\MpsSvc" /v "Start" /t REG_DWORD /d 4 /f
+                    reg add "HKLM\SYSTEM\CurrentControlSet\Services\WinDefend" /v "Start" /t REG_DWORD /d 4 /f
             -
                 name: Disable Smart Screen 
                 recommend: false