From 7161ec41ee7d206c3afbac93664130c06f3a8dc8 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Fri, 12 Jan 2018 19:41:52 +0000
Subject: [PATCH] always build the latest tag

---
 .gitignore                             |  2 +-
 docker/docker-compose.yml              |  2 --
 docker/netdisco-postgresql/Dockerfile  | 12 ++++--------
 docker/netdisco-postgresql/hooks/build |  2 --
 4 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100755 docker/netdisco-postgresql/hooks/build

diff --git a/.gitignore b/.gitignore
index 3e7a99da..91776448 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,6 @@ MANIFEST.*
 *.komodo*
 Makefile*
 Build
-!docker/hooks/*
 _build
 blib
+docker/netdisco
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 0ce29e9d..12675481 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -4,8 +4,6 @@ services:
     image: netdisco-postgresql:latest
     build:
       context: netdisco-postgresql
-      args:
-        - TAG
     volumes:
       - "./netdisco/pgdata:/var/lib/postgresql/data"
 #  netdisco-base:
diff --git a/docker/netdisco-postgresql/Dockerfile b/docker/netdisco-postgresql/Dockerfile
index e8f9abad..b8a7e284 100644
--- a/docker/netdisco-postgresql/Dockerfile
+++ b/docker/netdisco-postgresql/Dockerfile
@@ -1,20 +1,16 @@
 # vim: ft=Dockerfile
 FROM docker.io/postgres:9.6.6-alpine
 
-ARG TAG
-ENV TAG ${TAG:-master}
-
 RUN apk add --no-cache \
   curl \
   jq \
   tar
 
 WORKDIR /var/lib/postgresql/netdisco-sql
-RUN curl -sL "https://api.github.com/repos/netdisco/netdisco/tarball/${TAG}" | \
-  tar --wildcards -zt '*App-Netdisco-DB-*' | xargs -n1 basename | sort -n -t '-' -k4 | \
-  while read file; \
-    do curl -sLO "https://raw.githubusercontent.com/netdisco/netdisco/${TAG}/share/schema_versions/$file"; \
-  done && \
+RUN curl -s https://api.github.com/repos/netdisco/netdisco/tags | \
+  jq '.[]|.name|select(test("^\\d+\\.\\d+$"))|"https://api.github.com/repos/netdisco/netdisco/tarball/"+.' | \
+  sort -rg | head -n1 | xargs -n1 curl -sL | \
+  tar --wildcards --strip-components=3 -zx '*App-Netdisco-DB-*' && \
   curl -sLO "https://raw.githubusercontent.com/netdisco/upstream-sources/master/ieee/oui.sql" && \
   curl -sLO "https://raw.githubusercontent.com/netdisco/netdisco/master/lib/App/Netdisco/DB.pm"
 
diff --git a/docker/netdisco-postgresql/hooks/build b/docker/netdisco-postgresql/hooks/build
deleted file mode 100755
index 92084c68..00000000
--- a/docker/netdisco-postgresql/hooks/build
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker build --build-arg TAG=$SOURCE_BRANCH -t $IMAGE_NAME .