From 3c7a82330760bb28a88dacd2628c9804547986c8 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Fri, 15 May 2020 09:27:58 -0700 Subject: [PATCH] fix telize Signed-off-by: Jess Frazelle --- pond/Dockerfile | 44 -------------------------------------------- telize/Dockerfile | 7 ++++--- 2 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 pond/Dockerfile diff --git a/pond/Dockerfile b/pond/Dockerfile deleted file mode 100644 index 8ff4990..0000000 --- a/pond/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM golang:latest as builder -LABEL maintainer "Jessie Frazelle " - -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" ] diff --git a/telize/Dockerfile b/telize/Dockerfile index db6a064..9360233 100644 --- a/telize/Dockerfile +++ b/telize/Dockerfile @@ -176,6 +176,7 @@ STOPSIGNAL SIGTERM EXPOSE 80 443 ENV TELIZE_VERSION 66063c6c6e5bbbafcf493c5bc7c825f0a6e1b03d +ENV LICENSE_KEY lgNvGyhnUKpa5PJi RUN set -x \ && apk add --no-cache --virtual .build-deps \ @@ -183,9 +184,9 @@ RUN set -x \ git \ && rm -rf /var/lib/apt/lists/* \ && 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 "http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.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-Country&license_key=${LICENSE_KEY}&suffix=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 "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 \ && ( \ cd /usr/src/telize \