Dev to Main (#20)

Dev image has been stable so far. Moving to latest.

.github/workflows/dev.yml

@@ -2,22 +2,29 @@ name: Publish Docker Image
 on: 
   push:
     branches:
-      - '*'
+      - 'dev'
 jobs:
   docker:
     runs-on: ubuntu-latest
     env:
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
+      -
+        name: Job Start
+        uses: act10ns/slack@v2
+        with:
+          status: starting
+          channel: '#dev'
+          message: Starting aegis dev build and push...
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       -
         name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -33,4 +40,5 @@ jobs:
         with:
           status: ${{ job.status }}
           channel: '#dev'
+          message: Build Complete
         if: always()

.github/workflows/main.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           status: starting
           channel: '#docker-build'
-          message: Starting aegis build and push...
+          message: Starting aegis main build and push...
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -41,6 +41,6 @@ jobs:
         uses: act10ns/slack@v2
         with:
           status: ${{ job.status }}
-          channel: '#docker-build'
+          channel: '#prod'
           message: BUILD COMPLETE {{env.GITHUB_REF_NAME }}
         if: always()

Dockerfile

@@ -3,9 +3,10 @@ FROM kalilinux/kali-rolling:latest
 
 LABEL "project"="aegis"
 LABEL "author"="fr3d"
-LABEL "version"="v1.4.1"
+LABEL "version"="v1.4.2"
+LABEL "environment"="dev"
 
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ="America/New_York"
 
 RUN apt-get update && apt-get install sudo -y
@@ -15,9 +16,9 @@ RUN groupadd --gid 1000 kali \
   --gid 1000 --shell /bin/bash --skel /dev/null kali
 
 RUN chown -R kali:kali /home/kali/ \
-    && echo kali:kali | chpasswd \
-    && usermod -aG sudo kali \
-    && echo 'kali  ALL=(ALL) NOPASSWD:ALL' >>  /etc/sudoers.d/kali
+  && echo kali:kali | chpasswd \
+  && usermod -aG sudo kali \
+  && echo 'kali  ALL=(ALL) NOPASSWD:ALL' >>  /etc/sudoers.d/kali
 
 WORKDIR /home/kali/
 
@@ -41,8 +42,6 @@ RUN sudo rm -rf /tmp/sources && sudo rm -rf /home/kali/resources
 
 USER kali
 
-RUN pipx ensurepath && pipx install impacket certipy-ad
-
 RUN sudo chsh $USER -s /bin/zsh
 
 RUN zsh

README.md

@@ -29,12 +29,11 @@ alias udp-scan='sudo nmap -sU --top-ports 10 $IP -v > udp.scan.txt'
 alias stealth-scan='sudo nmap --data-length 6 -T3 -A -ttl 64 -p- $IP > stealth-scan.txt'
 alias public='curl wtfismyip.com/text'
 alias t='tmux new -f ~/.tmux.conf -s $1'
-alias webserver="miniserve -p 8001"
 alias :q='exit'
 alias home='cd ~'
 alias :r='. ~/.bashrc'
 alias update='sudo apt update'
-alias upgrade='sudo apt-get upgrade -y'
+alias upgrade='sudo apt upgrade -y'
 alias i='sudo apt install -y'
 alias ls='ls --color=auto'
 alias command='cat $HOME/.commands'
@@ -67,18 +66,15 @@ aegis destory - destory a container
 aegis backup - backup shared volume
 aegis pull - update to latest image (dev, latest)
 aegis help - view this help menu
-
 ```
 
-Command list:
-
-- Tired of looking for a specific command or long one liner? You can use this handy alias to search the prebuilt history for commonly used commands
+## Command history
+- Useful commands are already built into the container history. Simple type `CTRL+r' to pull up the fzf window where you can filter for the needed command. fzf makes navigating commands and files a breeze.
 
-```
-alias command='cat $HOME/.commands'
-```
 
 TODO:
 - add quick https server script
 - Python wrapper (FUTURE)
-- Revamp bash function into script (alpha)
+- Revamp bash function into script (beta)
+- fzf usage (only works in zsh)
+- miniserve quick web server w/ TLS function (done)