diff --git a/alpine.Dockerfile b/alpine.Dockerfile index ff5849a..805cd3a 100644 --- a/alpine.Dockerfile +++ b/alpine.Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.9 LABEL maintainer="urielCh " -RUN apk add --no-cache xvfb pulseaudio supervisor x11vnc xdg-utils wget chromium nodejs +RUN apk add --no-cache xvfb pulseaudio supervisor x11vnc xdg-utils wget chromium nodejs dbus ttf-dejavu RUN set -ex;\ adduser -D -u 1000 chrome pulse-access;\ diff --git a/conf/chrome.sh b/conf/chrome.sh index 4c1e9e4..f2b80ba 100755 --- a/conf/chrome.sh +++ b/conf/chrome.sh @@ -8,6 +8,8 @@ if [ ! -z "$EVAL_URL" ]; then URL=$(eval "echo ${URL}"); fi; rm -rf $HOME/.cache/chromium rm -rf $HOME/.config/chromium +dbus-uuidgen > /etc/machine-id + # /usr/bin/google-chrome-stable /usr/bin/chromium-browser ${EXTRA_CHROME_OPTION} \ --purge-memory-button \ @@ -19,6 +21,7 @@ rm -rf $HOME/.config/chromium --disable-infobars \ --disable-metrics \ --disable-preconnect \ + --disable-software-rasterizer \ --disable-speech-api \ --disable-sync \ --disable-sync-app-list \ diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..103cc2e --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,18 @@ +version: '3' +services: + web: + build: + context: . + dockerfile: alpine.Dockerfile + ports: + - "5901:5900" + environment: + - EXTRA_CHROME_OPTION=--lang=fr-FR,fr + - X11_W=1024 + - X11_H=768 + - LANG=fr_FR.UTF-8 + - LC_ALL=fr_FR.UTF-8 + - URL=https://maps.google.fr + - URL2=https://maps.google.fr + + diff --git a/proxy/Dockerfile b/proxy/Dockerfile deleted file mode 100644 index 6b43788..0000000 --- a/proxy/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM golang:1.11 as builder - -WORKDIR /root/ -RUN go get golang.org/x/time/rate && \ - mkdir -p /go/src/github.com/snail007/ && \ - cd /go/src/github.com/snail007/ && \ - git clone https://github.com/snail007/goproxy.git && \ - cd goproxy && \ - sed -i 's@"proxy/@"github.com/snail007/goproxy/@g' config.go main.go services/*.go && \ - CGO_ENABLED=0 go get . && \ - cp auth-file blocked direct /go/bin - - -FROM alpine:latest -WORKDIR /root/ -COPY --from=builder /go/bin/* /root/ - -ENTRYPOINT [ "./goproxy"] - diff --git a/proxy/Dockerfile.wget b/proxy/Dockerfile.wget deleted file mode 100644 index bfe50f5..0000000 --- a/proxy/Dockerfile.wget +++ /dev/null @@ -1,12 +0,0 @@ -FROM golang as builder -WORKDIR /root/ -RUN FILE=proxy-$(go env GOOS)-$(go env GOARCH).tar.gz && \ - wget https://github.com/snail007/goproxy/releases/download/v7.3/$FILE -O $FILE && \ - tar -xvzf $FILE && \ - rm $FILE - -FROM alpine:latest -WORKDIR /root/ -COPY --from=builder /root/* /root/ -CMD [ "/bin/sh" ] -#ENTRYPOINT [ "./proxy" ] diff --git a/proxy/README.md b/proxy/README.md deleted file mode 100644 index 925483c..0000000 --- a/proxy/README.md +++ /dev/null @@ -1,5 +0,0 @@ - -docker build -t urielch/snail007-goproxy:v7.3-$(uname -s)-$(uname -m) . -docker push urielch/snail007-goproxy:v7.3-$(uname -s)-$(uname -m) - -