continue pin / prep images ghcr

docker/tanner/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     tty: true
     networks:
      - tanner_local
-    image: "dtagdevsec/redis:2006"
+    image: "ghcr.io/telekom-security/redis:2006"
     read_only: true
 
 # PHP Sandbox service
@@ -28,7 +28,7 @@ services:
     tty: true
     networks:
      - tanner_local
-    image: "dtagdevsec/phpox:2006"
+    image: "ghcr.io/telekom-security/phpox:2006"
     read_only: true
 
 # Tanner API Service
@@ -42,7 +42,7 @@ services:
     tty: true
     networks:
      - tanner_local
-    image: "dtagdevsec/tanner:2006"
+    image: "ghcr.io/telekom-security/tanner:2006"
     read_only: true
     volumes:
      - /data/tanner/log:/var/log/tanner
@@ -63,7 +63,7 @@ services:
      - tanner_local
 #    ports:
 #     - "127.0.0.1:8091:8091"
-    image: "dtagdevsec/tanner:2006"
+    image: "ghcr.io/telekom-security/tanner:2006"
     command: tannerweb
     read_only: true
     volumes:
@@ -82,7 +82,7 @@ services:
     tty: true
     networks:
      - tanner_local
-    image: "dtagdevsec/tanner:2006"
+    image: "ghcr.io/telekom-security/tanner:2006"
     command: tanner
     read_only: true
     volumes:
@@ -104,6 +104,6 @@ services:
      - tanner_local
     ports:
      - "80:80"
-    image: "dtagdevsec/snare:2006"
+    image: "ghcr.io/telekom-security/snare:2006"
     depends_on:
      - tanner

docker/tanner/phpox/Dockerfile

@@ -15,8 +15,9 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
                re2c && \
 #
 # Install bfr sandbox from git
-    git clone --depth=1 https://github.com/mushorg/BFR /opt/BFR && \
+    git clone https://github.com/mushorg/BFR /opt/BFR && \
     cd /opt/BFR && \
+    git checkout 508729202428a35bcc6bb27dd97b831f7e5009b5 && \
     phpize7 && \
     ./configure \
       --with-php-config=/usr/bin/php-config7 \
@@ -28,8 +29,9 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
     echo "zend_extension = "$(find /usr -name bfr.so) >> /etc/php7/php.ini && \
 #
 # Install PHP Sandbox
-    git clone --depth=1 https://github.com/mushorg/phpox /opt/phpox && \
+    git clone https://github.com/mushorg/phpox /opt/phpox && \
     cd /opt/phpox && \
+    git checkout 001437b9ed3e228fac3828e18fe90991a330578d && \
     pip3 install -r requirements.txt && \
     make && \
 #

docker/tanner/snare/Dockerfile

@@ -13,8 +13,9 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
                python3-dev && \ 
 #
 # Setup Snare 
-    git clone --depth=1 https://github.com/mushorg/snare /opt/snare && \
+    git clone https://github.com/mushorg/snare /opt/snare && \
     cd /opt/snare/ && \
+    git checkout 7762b762b272f0599c16e11ef997c37d2899d33e && \
     pip3 install --no-cache-dir setuptools && \
     pip3 install --no-cache-dir -r requirements.txt && \
     python3 setup.py install && \

docker/tanner/tanner/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3.12
 #
 # Include dist
 ADD dist/ /root/dist/
@@ -18,10 +18,11 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
                python3-dev && \ 
 #
 # Setup Tanner
-    git clone --depth=1 https://github.com/mushorg/tanner /opt/tanner && \
+    git clone https://github.com/mushorg/tanner /opt/tanner && \
     cd /opt/tanner/ && \
 #    git fetch origin pull/364/head:test && \	
 #    git checkout test && \
+    git checkout 40e2357119065445cbb06234e953a95e5a73ce93 && \
     cp /root/dist/config.yaml /opt/tanner/tanner/data && \
     pip3 install --no-cache-dir setuptools && \
     pip3 install --no-cache-dir -r requirements.txt && \