fix telize

Signed-off-by: Jess Frazelle <jess@oxide.computer>
This commit is contained in:
Jess Frazelle 2020-05-15 09:27:58 -07:00
parent 72e15e12d8
commit 3c7a823307
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
2 changed files with 4 additions and 47 deletions

View File

@ -1,44 +0,0 @@
FROM golang:latest as builder
LABEL maintainer "Jessie Frazelle <jess@linux.com>"
ENV PATH /go/bin:/usr/local/go/bin:$PATH
ENV GOPATH /go
RUN apt-get update && apt-get install -y \
libgtk-3-dev \
libgtkspell3-3-dev \
libtspi-dev \
pkg-config \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*
RUN go get -d -v github.com/agl/pond/client \
&& go get -d -v github.com/agl/pond/server
WORKDIR /go/src/github.com/agl/pond
RUN go build -o /usr/bin/pond-client ./client \
&& go build -o /usr/bin/pond-server ./server
FROM debian:bullseye-slim
RUN apt-get update && apt-get install -y \
ca-certificates \
libgtk-3-0 \
libgtkspell3-3-0 \
libtspi1 \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*
# create pond user
ENV HOME /home/pond
RUN useradd --create-home --home-dir $HOME pond \
&& chown -R pond:pond $HOME
WORKDIR $HOME
USER pond
COPY --from=builder /usr/bin/pond-client /usr/bin/pond-client
COPY --from=builder /usr/bin/pond-server /usr/bin/pond-server
CMD [ "pond-client", "-cli" ]

View File

@ -176,6 +176,7 @@ STOPSIGNAL SIGTERM
EXPOSE 80 443 EXPOSE 80 443
ENV TELIZE_VERSION 66063c6c6e5bbbafcf493c5bc7c825f0a6e1b03d ENV TELIZE_VERSION 66063c6c6e5bbbafcf493c5bc7c825f0a6e1b03d
ENV LICENSE_KEY lgNvGyhnUKpa5PJi
RUN set -x \ RUN set -x \
&& apk add --no-cache --virtual .build-deps \ && apk add --no-cache --virtual .build-deps \
@ -183,9 +184,9 @@ RUN set -x \
git \ git \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& mkdir -p /usr/share/GeoIP \ && mkdir -p /usr/share/GeoIP \
&& curl -sSL "http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz" | tar -xzf - --strip-components 1 -C /usr/share/GeoIP \ && curl -sSL "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country&license_key=${LICENSE_KEY}&suffix=tar.gz" | tar -xzf - --strip-components 1 -C /usr/share/GeoIP \
&& curl -sSL "http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz" | tar -xzf - --strip-components 1 -C /usr/share/GeoIP \ && curl -sSL "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City&license_key=${LICENSE_KEY}&suffix=tar.gz" | tar -xzf - --strip-components 1 -C /usr/share/GeoIP \
&& curl -sSL "http://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz" | tar -xzf - --strip-components 1 -C /usr/share/GeoIP \ && curl -sSL "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN&license_key=${LICENSE_KEY}&suffix=tar.gz" | tar -xzf - --strip-components 1 -C /usr/share/GeoIP \
&& git clone https://github.com/fcambus/telize.git /usr/src/telize \ && git clone https://github.com/fcambus/telize.git /usr/src/telize \
&& ( \ && ( \
cd /usr/src/telize \ cd /usr/src/telize \