Signed-off-by: Jess Frazelle <jess@oxide.computer>
This commit is contained in:
Jess Frazelle 2020-05-15 02:13:45 -07:00
parent e3b946b841
commit c91ab7588f
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
4 changed files with 28 additions and 12 deletions

View File

@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y \
libgl1-mesa-dev \ libgl1-mesa-dev \
libgl1-mesa-dri \ libgl1-mesa-dri \
libxcursor-dev \ libxcursor-dev \
libxxf86vm-dev \
libxi-dev \ libxi-dev \
libxinerama-dev \ libxinerama-dev \
libxrandr-dev \ libxrandr-dev \

View File

@ -34,7 +34,7 @@ RUN useradd --create-home --home-dir $HOME user \
ENV LANG C.UTF-8 ENV LANG C.UTF-8
# https://www.torproject.org/projects/torbrowser.html.en # https://www.torproject.org/projects/torbrowser.html.en
ENV TOR_VERSION 9.0.7 ENV TOR_VERSION 9.0.10
ENV TOR_FINGERPRINT 0x4E2C6E8793298290 ENV TOR_FINGERPRINT 0x4E2C6E8793298290
# download tor and check signature # download tor and check signature

View File

@ -1,18 +1,32 @@
FROM golang:alpine as builder FROM golang:latest as builder
LABEL maintainer="Jessica Frazelle <jess@linux.com>" LABEL maintainer="Jessica Frazelle <jess@linux.com>"
ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV PATH /go/bin:/usr/local/go/bin:$PATH
ENV GOPATH /go ENV GOPATH /go
RUN apk add --no-cache \ RUN apt-get update && apt-get install -y \
--repository http://dl-cdn.alpinelinux.org/alpine/edge/main/ \ apt-transport-https \
bash \
ca-certificates \ ca-certificates \
curl \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
RUN apt-get update && apt-get install -y \
gcc \
git \ git \
g++ \
make \ make \
npm \ nodejs \
pkgconf \
python \
yarn \ yarn \
zip zip \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*
ENV VAULT_VERSION v1.4.1 ENV VAULT_VERSION v1.4.1

View File

@ -19,9 +19,10 @@ RUN apk add --no-cache \
git \ git \
libffi-dev \ libffi-dev \
libressl-dev \ libressl-dev \
python \ olm-dev \
python-dev \ python3 \
py2-pip \ python3-dev \
py3-pip \
weechat \ weechat \
weechat-perl \ weechat-perl \
weechat-python \ weechat-python \
@ -34,8 +35,8 @@ RUN adduser -S user -h $HOME \
&& cd $HOME \ && cd $HOME \
&& git clone https://github.com/poljar/weechat-matrix.git \ && git clone https://github.com/poljar/weechat-matrix.git \
&& cd weechat-matrix \ && cd weechat-matrix \
&& pip install -r requirements.txt \ && pip3 install -r requirements.txt \
&& pip install websocket-client \ && pip3 install websocket-client \
&& make install \ && make install \
&& chown -R user $HOME && chown -R user $HOME