From 1ff38730d25067a8b1367c5bb95fce164bd2cd72 Mon Sep 17 00:00:00 2001
From: tobsec <tobias.claus@web.de>
Date: Thu, 17 Nov 2022 10:43:59 +0100
Subject: [PATCH] Upgrade Keycloak dependency (#60)
* Change ownership not working for key.pem
* Fix Keycloak not importing realm, default path of keycloak to /auth
* Set default path of keycloak to /auth
---
dev/docker/Dockerfile | 20 ++++++++++----------
dev/docker/docker-compose.yml | 5 ++---
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index 64d4f72..3a03068 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -3,6 +3,9 @@ FROM golang as builder
RUN apt-get update && apt-get install -y libpam-dev
+# add user
+RUN adduser --disabled-password --gecos "" --home /opt/rdpgw --uid 1001 rdpgw
+
# certificate
RUN mkdir -p /opt/rdpgw && cd /opt/rdpgw && \
random=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) && \
@@ -13,9 +16,6 @@ RUN mkdir -p /opt/rdpgw && cd /opt/rdpgw && \
-subj "/C=US/ST=VA/L=SomeCity/O=MyCompany/OU=MyDivision/CN=rdpgw" && \
openssl x509 -req -days 365 -in server.csr -signkey key.pem -out server.pem
-# add user
-RUN adduser --disabled-password --gecos "" --home /opt/rdpgw --uid 1001 rdpgw
-
# build rdpgw and set rights
ARG CACHEBUST
RUN git clone https://github.com/bolkedebruin/rdpgw.git /app && \
@@ -25,20 +25,20 @@ RUN git clone https://github.com/bolkedebruin/rdpgw.git /app && \
CGO_ENABLED=1 GOOS=linux go build -trimpath -tags '' -ldflags '' -o '/opt/rdpgw/rdpgw-auth' ./cmd/auth && \
chmod +x /opt/rdpgw/rdpgw && \
chmod +x /opt/rdpgw/rdpgw-auth && \
- chmod u+s /opt/rdpgw/rdpgw-auth && \
- chown -R 1001 /opt/rdpgw
+ chmod u+s /opt/rdpgw/rdpgw-auth
FROM scratch
# make tempdir in case filestore is used
ADD tmp.tar /
-COPY --from=builder /opt/rdpgw /opt/rdpgw
-COPY --from=builder /etc/passwd /etc/passwd
-COPY --from=builder /etc/ssl/certs /etc/ssl/certs
+USER 1001
+
+COPY --chown=1001 --from=builder /opt/rdpgw /opt/rdpgw
+COPY --chown=1001 --from=builder /etc/passwd /etc/passwd
+COPY --chown=1001 --from=builder /etc/ssl/certs /etc/ssl/certs
-COPY rdpgw.yaml /opt/rdpgw/rdpgw.yaml
+COPY --chown=1001 rdpgw.yaml /opt/rdpgw/rdpgw.yaml
-USER 1001
WORKDIR /opt/rdpgw
ENTRYPOINT ["/opt/rdpgw/rdpgw"]
diff --git a/dev/docker/docker-compose.yml b/dev/docker/docker-compose.yml
index 1ad2f4c..d91e8d3 100644
--- a/dev/docker/docker-compose.yml
+++ b/dev/docker/docker-compose.yml
@@ -11,18 +11,17 @@ services:
image: quay.io/keycloak/keycloak:latest
hostname: keycloak
volumes:
- - ${PWD}/realm-export.json:/export/realm-export.json
+ - ${PWD}/realm-export.json:/opt/keycloak/data/import/realm-export.json
environment:
KEYCLOAK_USER: admin
KEYCLOAK_PASSWORD: admin
- KEYCLOAK_IMPORT: /export/realm-export.json
KEYCLOAK_ADMIN: admin
KEYCLOAK_ADMIN_PASSWORD: admin
ports:
- 8080:8080
restart: on-failure
command:
- - start-dev
+ - start-dev --import-realm --http-relative-path=/auth
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8080/auth"]
interval: 30s
--
GitLab