mirror of
https://github.com/jessfraz/dockerfiles.git
synced 2024-11-27 04:16:45 +01:00
fix buillds
Signed-off-by: Jess Frazelle <jess@oxide.computer>
This commit is contained in:
parent
76ab350d6b
commit
6e1142c207
|
@ -38,7 +38,6 @@ RUN apt-get update && apt-get install -y \
|
||||||
libedit-dev \
|
libedit-dev \
|
||||||
clang-format \
|
clang-format \
|
||||||
python \
|
python \
|
||||||
python-netaddr \
|
|
||||||
python3-pyroute2 \
|
python3-pyroute2 \
|
||||||
luajit \
|
luajit \
|
||||||
libluajit-5.1-dev \
|
libluajit-5.1-dev \
|
||||||
|
|
|
@ -9,7 +9,7 @@ RUN apk --no-cache add \
|
||||||
libc-dev
|
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
|
RUN git clone --depth 1 --branch "$CFSSL_VERSION" https://github.com/cloudflare/cfssl.git /go/src/github.com/cloudflare/cfssl
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
# wget https://raw.githubusercontent.com/jfrazelle/dotfiles/master/etc/docker/seccomp/chrome.json -O ~/chrome.json
|
# wget https://raw.githubusercontent.com/jfrazelle/dotfiles/master/etc/docker/seccomp/chrome.json -O ~/chrome.json
|
||||||
|
|
||||||
# Base docker image
|
# Base docker image
|
||||||
FROM debian:sid-slim
|
FROM debian:bullseye-slim
|
||||||
LABEL maintainer "Jessie Frazelle <jess@linux.com>"
|
LABEL maintainer "Jessie Frazelle <jess@linux.com>"
|
||||||
|
|
||||||
# Install Chrome
|
# Install Chrome
|
||||||
|
@ -32,7 +32,7 @@ RUN apt-get update && apt-get install -y \
|
||||||
libcanberra-gtk* \
|
libcanberra-gtk* \
|
||||||
libgl1-mesa-dri \
|
libgl1-mesa-dri \
|
||||||
libgl1-mesa-glx \
|
libgl1-mesa-glx \
|
||||||
libpango1.0-0 \
|
libpangox-1.0-0 \
|
||||||
libpulse0 \
|
libpulse0 \
|
||||||
libv4l-0 \
|
libv4l-0 \
|
||||||
fonts-symbola \
|
fonts-symbola \
|
||||||
|
@ -45,18 +45,6 @@ RUN apt-get update && apt-get install -y \
|
||||||
&& apt-get purge --auto-remove -y curl \
|
&& apt-get purge --auto-remove -y curl \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& 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
|
# Add chrome user
|
||||||
RUN groupadd -r chrome && useradd -r -g chrome -G audio,video chrome \
|
RUN groupadd -r chrome && useradd -r -g chrome -G audio,video chrome \
|
||||||
&& mkdir -p /home/chrome/Downloads && chown -R chrome:chrome /home/chrome
|
&& mkdir -p /home/chrome/Downloads && chown -R chrome:chrome /home/chrome
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
# wget https://raw.githubusercontent.com/jfrazelle/dotfiles/master/etc/docker/seccomp/chrome.json -O ~/chrome.json
|
# wget https://raw.githubusercontent.com/jfrazelle/dotfiles/master/etc/docker/seccomp/chrome.json -O ~/chrome.json
|
||||||
|
|
||||||
# Base docker image
|
# Base docker image
|
||||||
FROM debian:sid-slim
|
FROM debian:bullseye-slim
|
||||||
LABEL maintainer "Jessie Frazelle <jess@linux.com>"
|
LABEL maintainer "Jessie Frazelle <jess@linux.com>"
|
||||||
|
|
||||||
# Install Chrome
|
# Install Chrome
|
||||||
|
@ -32,7 +32,7 @@ RUN apt-get update && apt-get install -y \
|
||||||
libcanberra-gtk* \
|
libcanberra-gtk* \
|
||||||
libgl1-mesa-dri \
|
libgl1-mesa-dri \
|
||||||
libgl1-mesa-glx \
|
libgl1-mesa-glx \
|
||||||
libpango1.0-0 \
|
libpangox-1.0-0 \
|
||||||
libpulse0 \
|
libpulse0 \
|
||||||
libv4l-0 \
|
libv4l-0 \
|
||||||
fonts-symbola \
|
fonts-symbola \
|
||||||
|
@ -45,18 +45,6 @@ RUN apt-get update && apt-get install -y \
|
||||||
&& apt-get purge --auto-remove -y curl \
|
&& apt-get purge --auto-remove -y curl \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& 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
|
# Add chrome user
|
||||||
RUN groupadd -r chrome && useradd -r -g chrome -G audio,video chrome \
|
RUN groupadd -r chrome && useradd -r -g chrome -G audio,video chrome \
|
||||||
&& mkdir -p /home/chrome/Downloads && chown -R chrome:chrome /home/chrome
|
&& mkdir -p /home/chrome/Downloads && chown -R chrome:chrome /home/chrome
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
# wget https://raw.githubusercontent.com/jfrazelle/dotfiles/master/etc/docker/seccomp/chrome.json -O ~/chrome.json
|
# wget https://raw.githubusercontent.com/jfrazelle/dotfiles/master/etc/docker/seccomp/chrome.json -O ~/chrome.json
|
||||||
|
|
||||||
# Base docker image
|
# Base docker image
|
||||||
FROM debian:sid-slim
|
FROM debian:bullseye-slim
|
||||||
LABEL maintainer "Jessie Frazelle <jess@linux.com>"
|
LABEL maintainer "Jessie Frazelle <jess@linux.com>"
|
||||||
|
|
||||||
# Install Chromium
|
# Install Chromium
|
||||||
|
@ -32,7 +32,7 @@ RUN apt-get update && apt-get install -y \
|
||||||
libexif-dev \
|
libexif-dev \
|
||||||
libgl1-mesa-dri \
|
libgl1-mesa-dri \
|
||||||
libgl1-mesa-glx \
|
libgl1-mesa-glx \
|
||||||
libpango1.0-0 \
|
libpangox-1.0-0 \
|
||||||
libv4l-0 \
|
libv4l-0 \
|
||||||
fonts-symbola \
|
fonts-symbola \
|
||||||
--no-install-recommends \
|
--no-install-recommends \
|
||||||
|
@ -40,19 +40,6 @@ RUN apt-get update && apt-get install -y \
|
||||||
&& mkdir -p /etc/chromium.d/ \
|
&& 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
|
&& /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
|
# Add chromium user
|
||||||
RUN groupadd -r chromium && useradd -r -g chromium -G audio,video chromium \
|
RUN groupadd -r chromium && useradd -r -g chromium -G audio,video chromium \
|
||||||
&& mkdir -p /home/chromium/Downloads && chown -R chromium:chromium /home/chromium
|
&& mkdir -p /home/chromium/Downloads && chown -R chromium:chromium /home/chromium
|
||||||
|
|
Loading…
Reference in New Issue
Block a user