From d112cd4d9c615c7ea8ced7fbaa61a1d438879a0a Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Fri, 2 Dec 2016 13:42:52 -0800 Subject: [PATCH] fixes Signed-off-by: Jess Frazelle --- consul/Dockerfile | 2 +- doctor/Dockerfile | 4 ++-- dunnet/Dockerfile | 4 ++-- john/Dockerfile | 6 +++--- lpass/Dockerfile | 2 ++ powershell/Dockerfile | 6 ++++-- tetris/Dockerfile | 4 ++-- vagrant/Dockerfile | 3 ++- 8 files changed, 18 insertions(+), 13 deletions(-) diff --git a/consul/Dockerfile b/consul/Dockerfile index 50a5024..be7b3c4 100644 --- a/consul/Dockerfile +++ b/consul/Dockerfile @@ -26,7 +26,7 @@ RUN buildDeps=' \ zip \ ' \ set -x \ - && apk --no-cache add $buildDeps \ + && apk --no-cache add --repository https://dl-3.alpinelinux.org/alpine/edge/community $buildDeps \ && go get github.com/Soulou/curl-unix-socket \ && mv /go/bin/curl-unix-socket /usr/bin/ \ && mkdir -p /go/src/github.com/hashicorp /etc/consul.d \ diff --git a/doctor/Dockerfile b/doctor/Dockerfile index b79c54d..57f47b7 100644 --- a/doctor/Dockerfile +++ b/doctor/Dockerfile @@ -19,9 +19,9 @@ FROM alpine:latest MAINTAINER Jessie Frazelle # Install emacs: -# Note: Emacs is only in testing repo -> https://pkgs.alpinelinux.org/packages?package=emacs&repo=all&arch=x86_64 +# Note: Emacs is only community repo -> https://pkgs.alpinelinux.org/packages?package=emacs&repo=all&arch=x86_64 RUN apk --no-cache add \ - --repository https://dl-3.alpinelinux.org/alpine/edge/testing/ \ + --repository https://dl-3.alpinelinux.org/alpine/edge/community/ \ emacs # Autorun doctor diff --git a/dunnet/Dockerfile b/dunnet/Dockerfile index d528453..9864cc5 100644 --- a/dunnet/Dockerfile +++ b/dunnet/Dockerfile @@ -19,9 +19,9 @@ FROM alpine:latest MAINTAINER Jessie Frazelle # Install emacs: -# Note: Emacs is only in testing repo -> https://pkgs.alpinelinux.org/packages?package=emacs&repo=all&arch=x86_64 +# Note: Emacs is only in community repo -> https://pkgs.alpinelinux.org/packages?package=emacs&repo=all&arch=x86_64 RUN apk --no-cache add \ - --repository https://dl-3.alpinelinux.org/alpine/edge/testing/ \ + --repository https://dl-3.alpinelinux.org/alpine/edge/community/ \ emacs # Autorun dunnet diff --git a/john/Dockerfile b/john/Dockerfile index 3a0f12d..fe75c85 100644 --- a/john/Dockerfile +++ b/john/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:stretch +FROM debian:jessie MAINTAINER Jessie Frazelle RUN apt-get update && apt-get install -y \ @@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y \ libgomp1 \ libkrb5-3 \ libnss3 \ - libssl1.0.2 \ + libssl1.0.0 \ openssl \ --no-install-recommends \ && rm -rf /var/lib/apt/lists/* @@ -26,7 +26,7 @@ RUN buildDeps=' \ && rm -rf /var/lib/apt/lists/* \ && git clone https://github.com/magnumripper/JohnTheRipper.git /usr/src/johntheripper \ && cd /usr/src/johntheripper/src \ - && ./configure \ + && ./configure || cat config.log \ && make \ && cp -r ../run/* /usr/local/bin/ \ && rm -rf /usr/src/johntheripper \ diff --git a/lpass/Dockerfile b/lpass/Dockerfile index 316b43b..6436882 100644 --- a/lpass/Dockerfile +++ b/lpass/Dockerfile @@ -14,6 +14,7 @@ RUN set -x \ autoconf \ automake \ build-base \ + cmake \ curl-dev \ git \ libxml2-dev \ @@ -21,6 +22,7 @@ RUN set -x \ && git clone --depth 1 https://github.com/LastPass/lastpass-cli.git /usr/src/lastpass-cli \ && ( \ cd /usr/src/lastpass-cli \ + && cmake . \ && make \ && make install \ ) \ diff --git a/powershell/Dockerfile b/powershell/Dockerfile index 72e6c8b..4af822d 100644 --- a/powershell/Dockerfile +++ b/powershell/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:sid +FROM ubuntu:16.04 MAINTAINER Christian Koep ENV POWERSHELL_VERSION 6.0.0-alpha.13 @@ -6,8 +6,10 @@ ENV POWERSHELL_VERSION 6.0.0-alpha.13 RUN apt-get update && apt-get install -y \ ca-certificates \ curl \ - libunwind8 \ + libcurl3 \ libicu55 \ + libssl1.0.0 \ + libunwind8 \ dpkg \ --no-install-recommends \ && rm -rf /var/lib/apt/lists/* diff --git a/tetris/Dockerfile b/tetris/Dockerfile index 2eb81c9..17a05b4 100644 --- a/tetris/Dockerfile +++ b/tetris/Dockerfile @@ -19,9 +19,9 @@ FROM alpine:latest MAINTAINER Jessie Frazelle # Install emacs: -# Note: Emacs is only in testing repo -> https://pkgs.alpinelinux.org/packages?package=emacs&repo=all&arch=x86_64 +# Note: Emacs is only in community repo -> https://pkgs.alpinelinux.org/packages?package=emacs&repo=all&arch=x86_64 RUN apk --no-cache add \ - --repository https://dl-3.alpinelinux.org/alpine/edge/testing/ \ + --repository https://dl-3.alpinelinux.org/alpine/edge/community/ \ emacs # Autorun tetris diff --git a/vagrant/Dockerfile b/vagrant/Dockerfile index c7dbbf3..d26c557 100644 --- a/vagrant/Dockerfile +++ b/vagrant/Dockerfile @@ -9,11 +9,12 @@ RUN apt-get update && apt-get install -y \ make \ pkg-config \ ruby-dev \ + ruby-fog \ zlib1g-dev \ --no-install-recommends \ && rm -rf /var/lib/apt/lists/* -ENV VAGRANT_VERSION 1.9.0 +ENV VAGRANT_VERSION 1.8.7 ADD https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_x86_64.deb /src/vagrant_${VAGRANT_VERSION}_x86_64.deb