From 6e1142c2078ba65f306b518137313fa00114db0c Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Fri, 15 May 2020 01:24:43 -0700 Subject: [PATCH] fix buillds Signed-off-by: Jess Frazelle --- bcc-tools/Dockerfile | 1 - cfssl/Dockerfile | 2 +- chrome/beta/Dockerfile | 16 ++-------------- chrome/stable/Dockerfile | 16 ++-------------- chromium/Dockerfile | 17 ++--------------- 5 files changed, 7 insertions(+), 45 deletions(-) diff --git a/bcc-tools/Dockerfile b/bcc-tools/Dockerfile index 25fbdb5..bce7c92 100644 --- a/bcc-tools/Dockerfile +++ b/bcc-tools/Dockerfile @@ -38,7 +38,6 @@ RUN apt-get update && apt-get install -y \ libedit-dev \ clang-format \ python \ - python-netaddr \ python3-pyroute2 \ luajit \ libluajit-5.1-dev \ diff --git a/cfssl/Dockerfile b/cfssl/Dockerfile index d366058..a685c20 100644 --- a/cfssl/Dockerfile +++ b/cfssl/Dockerfile @@ -9,7 +9,7 @@ RUN apk --no-cache add \ libc-dev -ENV CFSSL_VERSION 1.4.1 +ENV CFSSL_VERSION v1.4.1 RUN git clone --depth 1 --branch "$CFSSL_VERSION" https://github.com/cloudflare/cfssl.git /go/src/github.com/cloudflare/cfssl diff --git a/chrome/beta/Dockerfile b/chrome/beta/Dockerfile index 408e835..091f78f 100644 --- a/chrome/beta/Dockerfile +++ b/chrome/beta/Dockerfile @@ -19,7 +19,7 @@ # wget https://raw.githubusercontent.com/jfrazelle/dotfiles/master/etc/docker/seccomp/chrome.json -O ~/chrome.json # Base docker image -FROM debian:sid-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " # Install Chrome @@ -32,7 +32,7 @@ RUN apt-get update && apt-get install -y \ libcanberra-gtk* \ libgl1-mesa-dri \ libgl1-mesa-glx \ - libpango1.0-0 \ + libpangox-1.0-0 \ libpulse0 \ libv4l-0 \ fonts-symbola \ @@ -45,18 +45,6 @@ RUN apt-get update && apt-get install -y \ && apt-get purge --auto-remove -y curl \ && rm -rf /var/lib/apt/lists/* -# Download the google-talkplugin -RUN set -x \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - && rm -rf /var/lib/apt/lists/* \ - && curl -sSL "https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb" -o /tmp/google-talkplugin-amd64.deb \ - && dpkg -i /tmp/google-talkplugin-amd64.deb \ - && rm -rf /tmp/*.deb \ - && apt-get purge -y --auto-remove curl - # Add chrome user RUN groupadd -r chrome && useradd -r -g chrome -G audio,video chrome \ && mkdir -p /home/chrome/Downloads && chown -R chrome:chrome /home/chrome diff --git a/chrome/stable/Dockerfile b/chrome/stable/Dockerfile index 6bd4380..314eb56 100644 --- a/chrome/stable/Dockerfile +++ b/chrome/stable/Dockerfile @@ -19,7 +19,7 @@ # wget https://raw.githubusercontent.com/jfrazelle/dotfiles/master/etc/docker/seccomp/chrome.json -O ~/chrome.json # Base docker image -FROM debian:sid-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " # Install Chrome @@ -32,7 +32,7 @@ RUN apt-get update && apt-get install -y \ libcanberra-gtk* \ libgl1-mesa-dri \ libgl1-mesa-glx \ - libpango1.0-0 \ + libpangox-1.0-0 \ libpulse0 \ libv4l-0 \ fonts-symbola \ @@ -45,18 +45,6 @@ RUN apt-get update && apt-get install -y \ && apt-get purge --auto-remove -y curl \ && rm -rf /var/lib/apt/lists/* -# Download the google-talkplugin -RUN set -x \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - && rm -rf /var/lib/apt/lists/* \ - && curl -sSL "https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb" -o /tmp/google-talkplugin-amd64.deb \ - && dpkg -i /tmp/google-talkplugin-amd64.deb \ - && rm -rf /tmp/*.deb \ - && apt-get purge -y --auto-remove curl - # Add chrome user RUN groupadd -r chrome && useradd -r -g chrome -G audio,video chrome \ && mkdir -p /home/chrome/Downloads && chown -R chrome:chrome /home/chrome diff --git a/chromium/Dockerfile b/chromium/Dockerfile index dcbcac0..65cd2d0 100644 --- a/chromium/Dockerfile +++ b/chromium/Dockerfile @@ -18,7 +18,7 @@ # wget https://raw.githubusercontent.com/jfrazelle/dotfiles/master/etc/docker/seccomp/chrome.json -O ~/chrome.json # Base docker image -FROM debian:sid-slim +FROM debian:bullseye-slim LABEL maintainer "Jessie Frazelle " # Install Chromium @@ -32,7 +32,7 @@ RUN apt-get update && apt-get install -y \ libexif-dev \ libgl1-mesa-dri \ libgl1-mesa-glx \ - libpango1.0-0 \ + libpangox-1.0-0 \ libv4l-0 \ fonts-symbola \ --no-install-recommends \ @@ -40,19 +40,6 @@ RUN apt-get update && apt-get install -y \ && mkdir -p /etc/chromium.d/ \ && /bin/echo -e 'export GOOGLE_API_KEY="AIzaSyCkfPOPZXDKNn8hhgu3JrA62wIgC93d44k"\nexport GOOGLE_DEFAULT_CLIENT_ID="811574891467.apps.googleusercontent.com"\nexport GOOGLE_DEFAULT_CLIENT_SECRET="kdloedMFGdGla2P1zacGjAQh"' > /etc/chromium.d/googleapikeys -# Download the google-talkplugin -RUN buildDeps=' \ - ca-certificates \ - curl \ - ' \ - && set -x \ - && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && curl -sSL "https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb" -o /tmp/google-talkplugin-amd64.deb \ - && dpkg -i /tmp/google-talkplugin-amd64.deb \ - && rm -rf /tmp/*.deb \ - && apt-get purge -y --auto-remove $buildDeps - # Add chromium user RUN groupadd -r chromium && useradd -r -g chromium -G audio,video chromium \ && mkdir -p /home/chromium/Downloads && chown -R chromium:chromium /home/chromium