From 38fb6ec21286b5b0886f0060a884c56e9d877a98 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Mon, 19 Sep 2016 12:12:06 -0700 Subject: [PATCH] cleanup Signed-off-by: Jess Frazelle --- buttslock/Dockerfile | 3 ++- camlistore/Dockerfile | 6 ++++-- cpuminer/Dockerfile | 2 +- imagemin/Dockerfile | 2 +- irssi/Dockerfile | 2 +- ykpersonalize/Dockerfile | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/buttslock/Dockerfile b/buttslock/Dockerfile index 263ea87..7f0b36d 100644 --- a/buttslock/Dockerfile +++ b/buttslock/Dockerfile @@ -8,7 +8,8 @@ # - /var/run/dbus, the X11 socket (typically /tmp/.X11-unix) # And it also requires the USER and DISPLAY environment variables to be set. # -FROM alpine +FROM alpine:latest + RUN apk --no-cache add \ i3lock \ imagemagick \ diff --git a/camlistore/Dockerfile b/camlistore/Dockerfile index 198cd6e..1fc8af1 100644 --- a/camlistore/Dockerfile +++ b/camlistore/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:latest MAINTAINER Jessica Frazelle ENV PATH /go/bin:/usr/local/go/bin:$PATH @@ -7,6 +7,8 @@ ENV GOPATH /go RUN apk --no-cache add \ ca-certificates +ENV CAMLISTORE_VERSION 0.9 + RUN buildDeps=' \ go \ git \ @@ -18,7 +20,7 @@ RUN buildDeps=' \ && apk --no-cache add $buildDeps \ && mkdir -p /go/src/camlistore.googlesource.com \ && cd /go/src/camlistore.googlesource.com \ - && git clone --depth 1 -b 0.9 https://camlistore.googlesource.com/camlistore.git \ + && git clone --depth 1 -b "${CAMLISTORE_VERSION}" https://camlistore.googlesource.com/camlistore.git \ && cd /go/src/camlistore.googlesource.com/camlistore \ && go run make.go \ && cp -r ./bin/* /usr/local/bin/ \ diff --git a/cpuminer/Dockerfile b/cpuminer/Dockerfile index b9f642f..38702a0 100644 --- a/cpuminer/Dockerfile +++ b/cpuminer/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:latest MAINTAINER Jessica Frazelle RUN apk add --no-cache \ diff --git a/imagemin/Dockerfile b/imagemin/Dockerfile index 8092bb4..8babc0a 100644 --- a/imagemin/Dockerfile +++ b/imagemin/Dockerfile @@ -6,7 +6,7 @@ # --entrypoint bash \ # jess/imagemin # -FROM alpine +FROM alpine:latest MAINTAINER Jessica Frazelle RUN apk --no-cache add \ diff --git a/irssi/Dockerfile b/irssi/Dockerfile index ec8c36a..c243033 100644 --- a/irssi/Dockerfile +++ b/irssi/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.3 +FROM alpine:latest RUN apk --no-cache add \ ca-certificates diff --git a/ykpersonalize/Dockerfile b/ykpersonalize/Dockerfile index 475c20b..297f553 100644 --- a/ykpersonalize/Dockerfile +++ b/ykpersonalize/Dockerfile @@ -6,7 +6,7 @@ # --name ykpersonalize \ # jess/ykpersonalize # -FROM ubuntu +FROM ubuntu:16.04 MAINTAINER Jessica Frazelle RUN apt-get update && apt-get install -y \