Skip to content

Commit

Permalink
fix guacamole rights
Browse files Browse the repository at this point in the history
  • Loading branch information
MaxWaldorf committed Jul 29, 2024
1 parent 244da65 commit 41ba711
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ RUN apk add --no-cache -X https://dl-cdn.alpinelinux.org/alpine/edge/testing gos
RUN groupadd guacd && \
useradd -s /bin/false -g guacd guacd
RUN chown guacd:guacd -R ${PREFIX_DIR}
RUN chown guacd:guacd -R ${GUACAMOLE_HOME}

# Install tomcat
RUN mkdir ${CATALINA_HOME}
Expand Down Expand Up @@ -302,11 +301,13 @@ RUN set -xe \
###############################################################################

# Finishing Container configuration
RUN chown tomcat:tomcat -R ${GUACAMOLE_HOME}

ENV PATH=/usr/lib/postgresql/${PG_MAJOR}/bin:$PATH
ENV GUACAMOLE_HOME=/config/guacamole
ENV CATALINA_PID=${CATALINA_HOME}/tomcat.pid
ENV POSTGRES_PID=/config/postgresql/postmaster.pid
ENV GUACD_PID=/config/guacamole/guacd.pid
ENV GUACD_PID=${PREFIX_DIR}/guacd.pid

# Copy files
COPY filefs /
Expand Down
2 changes: 1 addition & 1 deletion filefs/usr/local/bin/_startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if [ -d "/config/guacamole/" ]; then
fi
cp -rn /app/guacamole /config
mkdir -p /root/.config/freerdp/known_hosts
chown -R guacd:guacd /config/guacamole
chown -R tomcat:tomcat /config/guacamole
chown -R tomcat:tomcat /opt/tomcat # Might help to fix issues with bug on tomcat logs

# Own postgres folder if exist (change to alpine)
Expand Down
2 changes: 1 addition & 1 deletion scripts/guacd/wrapper_supervisor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function shutdown()
date
echo "Starting Guacd"

/opt/guacamole/sbin/guacd -b 0.0.0.0 -L $GUACD_LOG_LEVEL -p /config/guacamole/guacd.pid -f
/opt/guacamole/sbin/guacd -b 0.0.0.0 -L $GUACD_LOG_LEVEL -p $GUACD_PID -f

sleep 5

Expand Down

0 comments on commit 41ba711

Please sign in to comment.