Remove alpine base images (#59)

* Remove alpine base images from challenge templates
* Fix up a few miscellaneous issues
* Closes #50

Author: ColdHeat

ctfcli/templates/programming/default/{{cookiecutter.name}}/Dockerfile

@@ -1,8 +1,10 @@
-FROM python:3.7-alpine
+FROM python:3.7-slim-buster
+
+RUN apt-get update -y \
+    && apt-get install --no-install-recommends -y socat \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
-RUN apk update && \
-    apk add \
-        socat
 RUN mkdir "/opt/{{cookiecutter.name}}"
 COPY ./src/* "/opt/{{cookiecutter.name}}/"
 RUN pip install -r "/opt/{{cookiecutter.name}}/requirements.txt"

ctfcli/templates/programming/default/{{cookiecutter.name}}/docker-compose.yml

@@ -3,4 +3,4 @@ services:
   app:
     build: .
     ports:
-        - '8000:8000'
+        - '{{cookiecutter.port}}'

ctfcli/templates/programming/default/{{cookiecutter.name}}/src/requirements.txt

@@ -0,0 +1 @@
+six==1.16.0

ctfcli/templates/web/default/{{cookiecutter.name}}/Dockerfile

@@ -1,25 +1,16 @@
-FROM python:3.7-alpine
-RUN apk update && \
-    apk add \
-        python3-dev \
-        linux-headers \
-        libffi-dev \
-        gcc \
-        make \
-        musl-dev \
-        py-pip \
-        mysql-client \
-        git \
-        openssl-dev
-RUN adduser -D -u 1001 -s /bin/bash app
-
+FROM python:3.7-slim-buster
+RUN adduser \
+    --disabled-login \
+    -u 1001 \
+    --gecos "" \
+    --shell /bin/bash \
+    app
 WORKDIR /opt/app
 RUN mkdir -p /opt/app
 
 COPY src/ /opt/app/
-
 RUN pip install -r requirements.txt
-RUN chmod +x /opt/app/serve.sh
+RUN chown -R 1001:1001 /opt/app && chmod -R 755 /opt/app
 
 USER 1001
 EXPOSE 8000

ctfcli/templates/web/default/{{cookiecutter.name}}/src/requirements.txt

@@ -2,3 +2,4 @@ gunicorn==20.0.4
 Flask==1.1.1
 Bootstrap-Flask==1.2.0
 Flask-SQLAlchemy==2.4.4
+SQLAlchemy==1.3.17