Convert ddns to alpine

5 files changed, 27 insertions, 19 deletions

diff --git a/ddns/Dockerfile b/ddns/Dockerfile
index b112f56..4fe5082 100644
--- a/ddns/Dockerfile
+++ b/ddns/Dockerfile
@@ -1,19 +1,19 @@
-FROM ubuntu:14.04
-MAINTAINER Michael Crute <mike@crute.us>
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y curl python-pip uwsgi uwsgi-plugin-python && \
-    pip install flask boto && \
-    useradd -r -M -d /srv -s /bin/nologin ddns
-
-ADD uwsgi.ini /srv
-ADD bin/* /srv/bin/
+FROM alpine:latest
+LABEL maintainer="Mike Crute <mike@crute.us>"
 
 RUN \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* && \
-    rm -rf /tmp/*
+    apk add --no-cache \
+        py2-pip \
+        uwsgi \
+        uwsgi-python \
+    && pip install \
+        flask \
+        boto \
+    && addgroup -g 1002 -S ddns \
+    && adduser -u 1002 -S -H -D -G ddns ddns
+
+ADD uwsgi.ini /etc/uwsgi/
+ADD ddns.py /usr/share/ddns/
 
 STOPSIGNAL SIGINT
-CMD ["/usr/bin/uwsgi", "--ini", "/srv/uwsgi.ini"]
+CMD [ "/usr/sbin/uwsgi", "--ini", "/etc/uwsgi/uwsgi.ini" ]
diff --git a/ddns/Makefile b/ddns/Makefile
index 0d9df95..c28063f 100644
--- a/ddns/Makefile
+++ b/ddns/Makefile
@@ -1,11 +1,19 @@
+REPO=575365190010.dkr.ecr.us-west-2.amazonaws.com
+IMAGE=ddns:latest-alpine
+
 all:
-        docker build -t ddns .
+        docker build -t $(IMAGE) .
 
 all-no-cache:
-        docker build --no-cache -t ddns .
+        docker build --no-cache -t $(IMAGE) .
 
 run:
         docker run -d \
                 -p 9000:9000 \
                 -v /srv/ddns/ddns.cfg:/etc/ddns.cfg \
-                ddns
+                $(IMAGE)
+
+publish:
+        eval $$(aws ecr get-login --region us-west-2)
+        docker tag $(IMAGE) $(REPO)/$(IMAGE)
+        docker push $(REPO)/$(IMAGE)
diff --git a/ddns/bin/su-exec b/ddns/bin/su-exec
deleted file mode 100755
index 940f452..0000000
--- a/ddns/bin/su-exec
+++ /dev/null
diff --git a/ddns/bin/ddns.py b/ddns/ddns.py
index 5ec92da..5ec92da 100755
--- a/ddns/bin/ddns.py
+++ b/ddns/ddns.py
diff --git a/ddns/uwsgi.ini b/ddns/uwsgi.ini
index 8478fc0..c0892b2 100644
--- a/ddns/uwsgi.ini
+++ b/ddns/uwsgi.ini
@@ -4,7 +4,7 @@ socket = :9000
 uid = ddns
 gid = ddns
 plugin = python
-chdir = /srv/bin
+chdir = /usr/share/ddns
 workers = 2
 module = ddns:app
 harakiri = 300