Browse Source

Fix comment typo

Rod Hynes 2 years ago
parent
commit
5cb9c82907
2 changed files with 1 additions and 35 deletions
  1. 0 34
      psiphon/common/inproxy/Dockerfile
  2. 1 1
      psiphon/common/inproxy/doc.go

+ 0 - 34
psiphon/common/inproxy/Dockerfile

@@ -1,34 +0,0 @@
-# docker build --no-cache=true -t psiphon-inproxy-test .
-#
-# docker run \
-#   --platform=linux/amd64 \
-#   --user "$(id -u):$(id -g)" \ [maybe omit this line]
-#   --rm \
-#   -v $(go env GOCACHE):/.cache/go-build \
-#   -v $(go env GOMODCACHE):/go/pkg/mod \
-#   -v $PWD:/go/src/inproxy \
-#   psiphon-inproxy-test \
-#   /bin/bash -c 'PION_LOG_TRACE=all go test -v -timeout 30s -run TestInProxy'
-
-FROM --platform=linux/amd64 ubuntu:18.04
-
-# Install system-level dependencies.
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update -y && apt-get install -y --no-install-recommends \
-    build-essential \
-    ca-certificates \
-    curl \
-    git \
-    pkg-config \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-# Install Go.
-ENV GOVERSION=go1.19.2 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
-
-RUN curl -L https://storage.googleapis.com/golang/$GOVERSION.linux-amd64.tar.gz -o /tmp/go.tar.gz \
-   && tar -C /usr/local -xzf /tmp/go.tar.gz \
-   && rm /tmp/go.tar.gz \
-   && echo $GOVERSION > $GOROOT/VERSION
-
-WORKDIR /go/src/inproxy

+ 1 - 1
psiphon/common/inproxy/doc.go

@@ -37,7 +37,7 @@ providing blocking circumvention on the 2nd hop.
 
 Proxies don't create Psiphon tunnels, they just relay either TCP or UDP flows
 from the client to the server, where those flows are Psiphon tunnel
-protocols. Proxies don't need to be upgraded in order to rely newer Psiphon
+protocols. Proxies don't need to be upgraded in order to relay newer Psiphon
 tunnel protocols or protocol variants.
 
 Proxies cannot see the client traffic within the relayed Psiphon tunnel.