adding guacamole client version under java-bionic branch

Author: thelamer

Dockerfile

@@ -58,81 +58,59 @@ RUN \
 	/tmp/guacd_${GUACD_VERSION}-*.deb \
 	/tmp/out/guacd_${GUACD_VERSION}.deb
 
-# nodejs builder
-FROM lsiobase/ubuntu:bionic as nodebuilder
-ARG GCLIENT_RELEASE
-
-RUN \
- echo "**** install build deps ****" && \
- apt-get update && \
- apt-get install -y \
-	gnupg && \
- curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
- echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
-	> /etc/apt/sources.list.d/nodesource.list && \
- apt-get update && \
- apt-get install -y \
-	nodejs 
-
-RUN \
- echo "**** grab source ****" && \
- mkdir -p /gclient && \
- if [ -z ${GCLIENT_RELEASE+x} ]; then \
-	GCLIENT_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/gclient/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- curl -o \
- /tmp/gclient.tar.gz -L \
-	"https://github.com/linuxserver/gclient/archive/${GCLIENT_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/gclient.tar.gz -C \
-	/gclient/ --strip-components=1
-
-RUN \
- echo "**** install node modules ****" && \
- cd /gclient && \
- npm install 
-
 # runtime stage
 FROM lsiobase/rdesktop:bionic
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG GUACD_VERSION=1.1.0
+ARG TOMCAT_VER=tomcat9
+ENV TOMCAT_VER=${TOMCAT_VER}
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
 # Copy build outputs
 COPY --from=builder /tmp/out /tmp/out
-COPY --from=nodebuilder /gclient /gclient
 
 RUN \
  echo "**** install guacd ****" && \
  dpkg --path-include=/usr/share/doc/${PKG_NAME}/* \
         -i /tmp/out/guacd_${GUACD_VERSION}.deb && \
  echo "**** install packages ****" && \
  apt-get update && \
- apt-get install -y \
-	gnupg && \
- curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
- echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
-        > /etc/apt/sources.list.d/nodesource.list && \
- apt-get update && \
  DEBIAN_FRONTEND=noninteractive \
  apt-get install --no-install-recommends -y \
 	ca-certificates \
 	libfreerdp2-2 \
 	libfreerdp-client2-2 \
+	libjna-java \
 	libossp-uuid16 \
-	nodejs \
 	obconf \
 	openbox \
 	python \
+	${TOMCAT_VER} \
+	${TOMCAT_VER}-common \
+	${TOMCAT_VER}-user \
 	xterm && \
  apt-get install -qy --no-install-recommends \
 	$(cat /tmp/out/DEPENDENCIES) && \
- cd /usr/bin && \
+ echo "**** install guacamole ****" && \
+ mkdir -p \
+	/etc/guacamole/extensions \
+	/etc/guacamole/lib && \
+ curl -o /etc/guacamole/guacamole.war \
+	-L http://archive.apache.org/dist/guacamole/${GUACD_VERSION}/binary/guacamole-${GUACD_VERSION}.war && \
+ echo "GUACAMOLE_HOME=/etc/guacamole" >> /etc/default/${TOMCAT_VER} && \
+ ln -s /etc/guacamole /usr/share/${TOMCAT_VER}/.guacamole && \
+ usermod -a -G shadow tomcat && \
+ rm -Rf /var/lib/${TOMCAT_VER}/webapps/ROOT && \
+ curl -o /etc/guacamole/extensions/guacamole-auth-pam.jar \
+	-L https://github.com/voegelas/guacamole-auth-pam/releases/download/v1.4/guacamole-auth-pam-1.0.0.jar && \
+ chown -R tomcat:tomcat /var/lib/tomcat9/ && \
+ curl -o /tmp/libpam.deb \
+	-L "http://security.ubuntu.com/ubuntu/pool/universe/libp/libpam4j/libpam4j-java_1.4-2+deb8u1build0.16.04.1_all.deb" && \
+ dpkg -i /tmp/libpam.deb && \
  echo "**** cleanup ****" && \
  apt-get autoclean && \
  rm -rf \
@@ -144,5 +122,5 @@ RUN \
 COPY /root /
 
 # ports and volumes
-EXPOSE 3000
+EXPOSE 8080
 VOLUME /config

Dockerfile.aarch64

@@ -58,81 +58,59 @@ RUN \
 	/tmp/guacd_${GUACD_VERSION}-*.deb \
 	/tmp/out/guacd_${GUACD_VERSION}.deb
 
-# nodejs builder
-FROM lsiobase/ubuntu:arm64v8-bionic as nodebuilder
-ARG GCLIENT_RELEASE
-
-RUN \
- echo "**** install build deps ****" && \
- apt-get update && \
- apt-get install -y \
-	gnupg && \
- curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
- echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
-	> /etc/apt/sources.list.d/nodesource.list && \
- apt-get update && \
- apt-get install -y \
-	nodejs 
-
-RUN \
- echo "**** grab source ****" && \
- mkdir -p /gclient && \
- if [ -z ${GCLIENT_RELEASE+x} ]; then \
-	GCLIENT_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/gclient/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- curl -o \
- /tmp/gclient.tar.gz -L \
-	"https://github.com/linuxserver/gclient/archive/${GCLIENT_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/gclient.tar.gz -C \
-	/gclient/ --strip-components=1
-
-RUN \
- echo "**** install node modules ****" && \
- cd /gclient && \
- npm install 
-
 # runtime stage
 FROM lsiobase/rdesktop:arm64v8-bionic
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG GUACD_VERSION=1.1.0
+ARG TOMCAT_VER=tomcat9
+ENV TOMCAT_VER=${TOMCAT_VER}
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
 # Copy build outputs
 COPY --from=builder /tmp/out /tmp/out
-COPY --from=nodebuilder /gclient /gclient
 
 RUN \
  echo "**** install guacd ****" && \
  dpkg --path-include=/usr/share/doc/${PKG_NAME}/* \
         -i /tmp/out/guacd_${GUACD_VERSION}.deb && \
  echo "**** install packages ****" && \
  apt-get update && \
- apt-get install -y \
-	gnupg && \
- curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
- echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
-        > /etc/apt/sources.list.d/nodesource.list && \
- apt-get update && \
  DEBIAN_FRONTEND=noninteractive \
  apt-get install --no-install-recommends -y \
 	ca-certificates \
 	libfreerdp2-2 \
 	libfreerdp-client2-2 \
+	libjna-java \
 	libossp-uuid16 \
-	nodejs \
 	obconf \
 	openbox \
 	python \
+	${TOMCAT_VER} \
+	${TOMCAT_VER}-common \
+	${TOMCAT_VER}-user \
 	xterm && \
  apt-get install -qy --no-install-recommends \
 	$(cat /tmp/out/DEPENDENCIES) && \
- cd /usr/bin && \
+ echo "**** install guacamole ****" && \
+ mkdir -p \
+	/etc/guacamole/extensions \
+	/etc/guacamole/lib && \
+ curl -o /etc/guacamole/guacamole.war \
+	-L http://archive.apache.org/dist/guacamole/${GUACD_VERSION}/binary/guacamole-${GUACD_VERSION}.war && \
+ echo "GUACAMOLE_HOME=/etc/guacamole" >> /etc/default/${TOMCAT_VER} && \
+ ln -s /etc/guacamole /usr/share/${TOMCAT_VER}/.guacamole && \
+ usermod -a -G shadow tomcat && \
+ rm -Rf /var/lib/${TOMCAT_VER}/webapps/ROOT && \
+ curl -o /etc/guacamole/extensions/guacamole-auth-pam.jar \
+	-L https://github.com/voegelas/guacamole-auth-pam/releases/download/v1.4/guacamole-auth-pam-1.0.0.jar && \
+ chown -R tomcat:tomcat /var/lib/tomcat9/ && \
+ curl -o /tmp/libpam.deb \
+	-L "http://security.ubuntu.com/ubuntu/pool/universe/libp/libpam4j/libpam4j-java_1.4-2+deb8u1build0.16.04.1_all.deb" && \
+ dpkg -i /tmp/libpam.deb && \
  echo "**** cleanup ****" && \
  apt-get autoclean && \
  rm -rf \
@@ -144,5 +122,5 @@ RUN \
 COPY /root /
 
 # ports and volumes
-EXPOSE 3000
+EXPOSE 8080
 VOLUME /config

Dockerfile.armhf

@@ -58,81 +58,59 @@ RUN \
 	/tmp/guacd_${GUACD_VERSION}-*.deb \
 	/tmp/out/guacd_${GUACD_VERSION}.deb
 
-# nodejs builder
-FROM lsiobase/ubuntu:arm32v7-bionic as nodebuilder
-ARG GCLIENT_RELEASE
-
-RUN \
- echo "**** install build deps ****" && \
- apt-get update && \
- apt-get install -y \
-	gnupg && \
- curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
- echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
-	> /etc/apt/sources.list.d/nodesource.list && \
- apt-get update && \
- apt-get install -y \
-	nodejs 
-
-RUN \
- echo "**** grab source ****" && \
- mkdir -p /gclient && \
- if [ -z ${GCLIENT_RELEASE+x} ]; then \
-	GCLIENT_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/gclient/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- curl -o \
- /tmp/gclient.tar.gz -L \
-	"https://github.com/linuxserver/gclient/archive/${GCLIENT_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/gclient.tar.gz -C \
-	/gclient/ --strip-components=1
-
-RUN \
- echo "**** install node modules ****" && \
- cd /gclient && \
- npm install 
-
 # runtime stage
 FROM lsiobase/rdesktop:arm32v7-bionic
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG GUACD_VERSION=1.1.0
+ARG TOMCAT_VER=tomcat9
+ENV TOMCAT_VER=${TOMCAT_VER}
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
 # Copy build outputs
 COPY --from=builder /tmp/out /tmp/out
-COPY --from=nodebuilder /gclient /gclient
 
 RUN \
  echo "**** install guacd ****" && \
  dpkg --path-include=/usr/share/doc/${PKG_NAME}/* \
         -i /tmp/out/guacd_${GUACD_VERSION}.deb && \
  echo "**** install packages ****" && \
  apt-get update && \
- apt-get install -y \
-	gnupg && \
- curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
- echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
-        > /etc/apt/sources.list.d/nodesource.list && \
- apt-get update && \
  DEBIAN_FRONTEND=noninteractive \
  apt-get install --no-install-recommends -y \
 	ca-certificates \
 	libfreerdp2-2 \
 	libfreerdp-client2-2 \
+	libjna-java \
 	libossp-uuid16 \
-	nodejs \
 	obconf \
 	openbox \
 	python \
+	${TOMCAT_VER} \
+	${TOMCAT_VER}-common \
+	${TOMCAT_VER}-user \
 	xterm && \
  apt-get install -qy --no-install-recommends \
 	$(cat /tmp/out/DEPENDENCIES) && \
- cd /usr/bin && \
+ echo "**** install guacamole ****" && \
+ mkdir -p \
+	/etc/guacamole/extensions \
+	/etc/guacamole/lib && \
+ curl -o /etc/guacamole/guacamole.war \
+	-L http://archive.apache.org/dist/guacamole/${GUACD_VERSION}/binary/guacamole-${GUACD_VERSION}.war && \
+ echo "GUACAMOLE_HOME=/etc/guacamole" >> /etc/default/${TOMCAT_VER} && \
+ ln -s /etc/guacamole /usr/share/${TOMCAT_VER}/.guacamole && \
+ usermod -a -G shadow tomcat && \
+ rm -Rf /var/lib/${TOMCAT_VER}/webapps/ROOT && \
+ curl -o /etc/guacamole/extensions/guacamole-auth-pam.jar \
+	-L https://github.com/voegelas/guacamole-auth-pam/releases/download/v1.4/guacamole-auth-pam-1.0.0.jar && \
+ chown -R tomcat:tomcat /var/lib/tomcat9/ && \
+ curl -o /tmp/libpam.deb \
+	-L "http://security.ubuntu.com/ubuntu/pool/universe/libp/libpam4j/libpam4j-java_1.4-2+deb8u1build0.16.04.1_all.deb" && \
+ dpkg -i /tmp/libpam.deb && \
  echo "**** cleanup ****" && \
  apt-get autoclean && \
  rm -rf \
@@ -144,5 +122,5 @@ RUN \
 COPY /root /
 
 # ports and volumes
-EXPOSE 3000
+EXPOSE 8080
 VOLUME /config