From abfd4b6e02045fb4226e5300a684707462d17998 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Fri, 6 Jul 2018 10:35:33 -0400 Subject: [PATCH] update dockerfiles Signed-off-by: Jess Frazelle --- powershell/Dockerfile | 2 +- terraform/Dockerfile | 2 +- zoom-us/Dockerfile | 17 ++++++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/powershell/Dockerfile b/powershell/Dockerfile index 2dba2c9..e1d2f20 100644 --- a/powershell/Dockerfile +++ b/powershell/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster +FROM debian:sid LABEL maintainer "Christian Koep " ENV POWERSHELL_VERSION 6.1.0-preview.3 diff --git a/terraform/Dockerfile b/terraform/Dockerfile index 206ccb2..5abdc9a 100644 --- a/terraform/Dockerfile +++ b/terraform/Dockerfile @@ -24,7 +24,7 @@ RUN buildDeps=' \ && mkdir -p /go/src/github.com/hashicorp /etc/terraform.d \ && git clone --depth 1 --branch ${TERRAFORM_VERSION} https://github.com/hashicorp/terraform /go/src/github.com/hashicorp/terraform \ && cd /go/src/github.com/hashicorp/terraform \ - && XC_ARCH="amd64" XC_OS="linux" make fmt bin \ + && CGO_ENABLED=0 XC_ARCH="amd64" XC_OS="linux" make fmt bin \ && mv bin/terraform /usr/bin/terraform \ && apk del $buildDeps \ && rm -rf /go \ diff --git a/zoom-us/Dockerfile b/zoom-us/Dockerfile index aa4ea71..c861d22 100644 --- a/zoom-us/Dockerfile +++ b/zoom-us/Dockerfile @@ -1,14 +1,13 @@ -# docker build . -t zoom-us # docker run -d --rm \ -# -v /tmp/.X11-unix:/tmp/.X11-unix \ -# -e DISPLAY=unix\$DISPLAY \ -# --device /dev/video0 \ -# --device /dev/snd:/dev/snd \ -# --device /dev/dri \ -# -v /dev/shm:/dev/shm \ -# zoom-us +# -v /tmp/.X11-unix:/tmp/.X11-unix \ +# -e DISPLAY=unix\$DISPLAY \ +# --device /dev/video0 \ +# --device /dev/snd:/dev/snd \ +# --device /dev/dri \ +# -v /dev/shm:/dev/shm \ +# zoom-us -FROM debian:buster +FROM debian:sid ENV DEBIAN_FRONTEND noninteractive