rejig

Author: deployable

.dockerignore

@@ -0,0 +1 @@
+node_modules/

.gitignore

@@ -0,0 +1,2 @@
+*.swp
+node_modules/

Dockerfile

@@ -1,27 +1,25 @@
-from debian:jessie
+FROM debian:jessie
 
-run set -uex; \
+RUN set -uex; \
     apt-get update -y; \
     apt-get install apt-cacher-ng -y; \
     ln -sf /dev/stdout /var/log/apt-cacher-ng/apt-cacher.log; \
     ln -sf /dev/stderr /var/log/apt-cacher-ng/apt-cacher.err; \
     apt-get clean all;
 
-copy acng.conf /etc/apt-cacher-ng/acng.conf
-copy mirrors_alpine /etc/apt-cacher-ng/
+COPY files/acng.conf files/mirrors_alpine /etc/apt-cacher-ng/
 
-label org.label-schema.name = "deployable/apt-cacher-ng" \
-      org.label-schema.version="1.0.0" \
+LABEL org.label-schema.name = "deployable/apt-cacher-ng" \
+      org.label-schema.version="1.2.0" \
       org.label-schema.vendor="Deployable" \
       org.label-schema.docker.cmd="docker run --restart always -d -v apt-cacher-ng-vol:/var/cache/apt-cacher-ng:rw -p 3142:3142 deployable/apt-cacher-ng \
       org.label-schema.url="https://github.com/deployable/docker-apt-cacher-ng" \
       org.label-schema.vcs-url="https://github.com/deployable/docker-apt-cacher-ng.git" \
-      org.label-schema.vcs-ref = "b4cac33cff2491440c3c010aabc885387ade425f" \
       org.label-schema.schema-version="1.0" 
 
-expose 3142
-volume ["/var/cache/apt-cacher-ng"]
+EXPOSE 3142
+VOLUME ["/var/cache/apt-cacher-ng"]
 
-entrypoint ["/usr/sbin/apt-cacher-ng"]
-cmd ["-c","/etc/apt-cacher-ng"]
+ENTRYPOINT ["/usr/sbin/apt-cacher-ng"]
+CMD ["-c","/etc/apt-cacher-ng"]
 

README.md

@@ -2,7 +2,7 @@
 
 Apt-Cacher NG is a caching proxy for linux distribution packages, primarily Debian. https://www.unix-ag.uni-kl.de/~bloch/acng/
 
-The container config adds support for alpine packages.
+The containers apt-cacher-ng config adds support for Alpine Linux packages from http://dl-cdn.alpinelinux.org.
 
 ## Run
 
@@ -29,3 +29,7 @@ Rebuild and run
 
 `./make.sh rebuild`
 
+## About 
+
+Matt Hoyle - [email protected]
+

acng.conf files/acng.conf

@@ -0,0 +1,32 @@
+{
+  "name": "docker-apt-cacher-ng",
+  "version": "1.0.0",
+  "description": "tests for docker ",
+  "main": "index.js",
+  "scripts": {
+    "test": "mocha"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/deployable/docker-apt-cacher-ng.git"
+  },
+  "keywords": [
+    "docker",
+    "apt-cacher-ng",
+    "proxy",
+    "cache",
+    "package"
+  ],
+  "author": "Matt Hoyle",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/deployable/docker-apt-cacher-ng/issues"
+  },
+  "homepage": "https://github.com/deployable/docker-apt-cacher-ng#readme",
+  "devDependencies": {
+    "chai": "^3.5.0",
+    "cheerio": "^0.22.0",
+    "coffeescript": "^1.12.4",
+    "mocha": "^3.2.0"
+  }
+}

backends_debian files/backends_debian

@@ -0,0 +1,5 @@
+global.chai = require('chai')
+global.expect = require('chai').expect
+
+process.env.NODE_ENV = 'test'
+

backends_ubuntu files/backends_ubuntu

@@ -0,0 +1,48 @@
+Promise = require('bluebird')
+needle = Promise.promisifyAll(require('needle'))
+cheerio = require('cheerio')
+debug = require('debug') 'dply:test:func:aptcacherng'
+
+request_options =
+  proxy: 'http://127.0.0.1:3142'
+
+getCacherPage = ( repo_url )->
+  needle.getAsync repo_url, request_options
+
+
+describe 'cache requests', ->
+
+
+  it 'responds with an apt error for a directory', ->
+    getCacherPage 'http://dl-cdn.alpinelinux.org/alpine/v3.5/', request_options
+      .then (res) ->
+        expect( res ).to.be.ok
+        $ = cheerio.load(res.body)
+        expect( $('body').text() ).to.match /Apt-Cacher NG/
+
+# curl 'http://dl-cdn.alpinelinux.org/alpine/v3.5/main/x86_64/APKINDEX.tar.gz' -H 'Host: dl-cdn.alpinelinux.org' -H 'User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Firefox/45.0' -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' -H 'Accept-Language: en-US,en;q=0.5' --compressed -H 'Referer: http://dl-cdn.alpinelinux.org/alpine/v3.5/main/x86_64/' -H 'Connection: keep-alive'
+
+  describe 'pulling a file', ->
+
+    this.timeout(5000)
+    file_request_options = request_options
+    res = null
+    
+    before ->
+      res = getCacherPage 'http://dl-cdn.alpinelinux.org/alpine/v3.5/main/x86_64/APKINDEX.tar.gz', file_request_options
+ 
+    it 'sould return a response', ->
+      expect( res ).to.be.ok
+
+    it 'sould return a buffer for the body', ->
+      expect( res.body ).to.be.an.instanceof Buffer
+
+    it 'should have headers', ->
+      expect( res.headers ).to.be.ok
+
+    it 'should have a bzip content type', ->
+      expect( res.headers['content-type'] ).to.equal 'application/x-gzip'
+ 
+    it 'should have a statusCode of 200', ->
+      expect( res.statusCode ).to.equal 200
+

mirrors_alpine files/mirrors_alpine

@@ -0,0 +1,5 @@
+--compilers coffee:coffeescript/register
+--require test/fixture/mocha_setup
+--reporter spec
+--ui bdd
+