From e9926eba17148d45219d77693e1fdcd9c68ed635 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Fri, 29 Jul 2016 00:07:14 +0800
Subject: [PATCH] upgrade gogs-arm to 0.9.48

---
 README.md            |  2 +-
 freeradius/README.md | 16 ++++++++--------
 gogs/arm/Dockerfile  | 27 +++++++++++++--------------
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 9f9b742..124ca86 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,6 @@ A collection of delicious docker recipes.
 - [ ] firehol
 - [ ] freegeoip
 - [ ] freelan
-- [ ] freeradius
 - [ ] gitbook
 - [ ] gitolite
 - [ ] hashcat
@@ -55,6 +54,7 @@ A collection of delicious docker recipes.
 - [x] cadvisor
 - [x] casperjs :+1:
 - [x] collectd
+- [x] freeradius
 - [x] h2o
 - [x] httpbin :+1:
 - [x] hubot
diff --git a/freeradius/README.md b/freeradius/README.md
index d02e22f..bc153e2 100644
--- a/freeradius/README.md
+++ b/freeradius/README.md
@@ -1,4 +1,4 @@
-FreeRadius
+FreeRADIUS
 ==========
 
 [FreeRADIUS][1] includes a RADIUS server, a BSD licensed client library, a PAM
@@ -84,13 +84,13 @@ Query OK, 1 row affected (0.02 sec)
 1 row in set (0.00 sec)
 
 >>> SELECT * FROM radpostauth;
-+----+----------+--------------------------------------------------------------+---------------+---------------------+
-| id | username | pass                                                         | reply         | authdate            |
-+----+----------+--------------------------------------------------------------+---------------+---------------------+
-|  1 | user     | pass                                                         | Access-Accept | 2016-07-28 06:28:28 |
-|  2 | user     | pass                                                         | Access-Accept | 2016-07-28 06:30:04 |
-|  3 | user     | xxxx                                                         | Access-Reject | 2016-07-28 06:30:22 |
-+----+----------+--------------------------------------------------------------+---------------+---------------------+
++----+----------+------+---------------+---------------------+
+| id | username | pass | reply         | authdate            |
++----+----------+------+---------------+---------------------+
+|  1 | user     | pass | Access-Accept | 2016-07-28 06:28:28 |
+|  2 | user     | pass | Access-Accept | 2016-07-28 06:30:04 |
+|  3 | user     | xxxx | Access-Reject | 2016-07-28 06:30:22 |
++----+----------+------+---------------+---------------------+
 
 >>> EXIT
 Bye
diff --git a/gogs/arm/Dockerfile b/gogs/arm/Dockerfile
index 6b0e300..037d44e 100644
--- a/gogs/arm/Dockerfile
+++ b/gogs/arm/Dockerfile
@@ -2,22 +2,21 @@
 # Dockerfile for gogs-arm
 #
 
-FROM easypi/alpine-arm:3.4
-MAINTAINER kev <noreply@easypi.info>
+FROM easypi/alpine-arm
+MAINTAINER EasyPi Software Foundation
 
+ENV GOGS_VERSION 0.9.48
 ENV GOGS_CUSTOM /data/gogs
 
-RUN set -xe \
-    && apk add -U bash \
-                  ca-certificates \
-                  curl \
-                  git \
-                  linux-pam \
-                  openssh \
-                  s6 \
-                  socat \
-                  tar \
-    && rm -rf /var/cache/apk/*
+RUN apk add --no-cache bash \
+                       ca-certificates \
+                       curl \
+                       git \
+                       linux-pam \
+                       openssh \
+                       s6 \
+                       socat \
+                       tar
 
 RUN set -xe \
     && adduser -H -D -g 'Gogs Git User' -h /data/git -s /bin/bash git \
@@ -31,7 +30,7 @@ RUN set -xe \
 RUN set -xe \
     && mkdir /app/ \
     && cd /app/ \
-    && curl -LO https://github.com/gogits/gogs/releases/download/v0.9.13/linux_arm.zip \
+    && curl -LO https://github.com/gogits/gogs/releases/download/v${GOGS_VERSION}/linux_arm.zip \
     && unzip linux_arm.zip \
     && rm linux_arm.zip