Merge branch 'master' of https://github.com/bolkedebruin/rdpgw

bolkedebruin · Aug 30, 2020 · 2628ba1 · 2628ba1
2 parents c66a2c9 + c76544e
commit 2628ba1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
@@ -10,14 +10,19 @@ RUN apt-get update && \
     -subj "/C=US/ST=VA/L=SomeCity/O=MyCompany/OU=MyDivision/CN=localhost" && \
     openssl x509 -req -days 365 -in server.csr -signkey key.pem -out server.pem
 
+RUN curl -L https://dl.google.com/go/go1.14.7.linux-amd64.tar.gz -o golang.tgz && \
+    tar zxvf golang.tgz && rm golang.tgz
+
 RUN git clone https://github.com/bolkedebruin/rdpgw.git && \
     cd rdpgw && \
-    env GOOS=linux GOARCH=amd64 go build && \
+    env GOOS=linux GOARCH=amd64 GOROOT=/go /go/bin/go build && \
     mkdir -p /opt/rdpgw && \
     mv rdpgw /opt/rdpgw/rdpgw && \
     rm -rf /root/go && \
     rm -rf /rdpgw
 
+RUN rm -rf /go
+
 COPY rdpgw.yaml /opt/rdpgw/rdpgw.yaml
 
 RUN useradd -m -d /opt/rdpgw -u 1001 -c "rdgw" rdgw && \

diff --git a/dev/docker/rdpgw.yaml b/dev/docker/rdpgw.yaml
@@ -5,7 +5,7 @@ server:
  port: 9443
  hosts:
   - xrdp:3389
- roundRobin: false 
+ roundRobin: false
  sessionKey: thisisasessionkeyreplacethisjetz
  sessionEncryptionKey: thisisasessionkeyreplacethisnunu
 openId:
@@ -18,4 +18,4 @@ client:
  bandwidthAutoDetect: 1
  ConnectionType: 6
 security:
-  tokenSigningKey: prettypleasereplacemeinproductio
+  PAATokenSigningKey: prettypleasereplacemeinproductio