Update Raspberry Pi File

This commit is contained in:
2022-01-23 16:52:56 -06:00
parent 1cca7390a0
commit c17430112e
2 changed files with 14 additions and 19 deletions
+8 -5
View File
@@ -1,4 +1,4 @@
FROM arm32v5/tomcat:9-jre11 FROM arm32v7/tomcat:9-jre11
ENV ARCH=armhf \ ENV ARCH=armhf \
GUAC_VER=1.4.0 \ GUAC_VER=1.4.0 \
@@ -8,16 +8,19 @@ ENV ARCH=armhf \
POSTGRES_USER=guacamole \ POSTGRES_USER=guacamole \
POSTGRES_DB=guacamole_db POSTGRES_DB=guacamole_db
# Install dependencies # Install dependencies
RUN apt-get update && apt-get install -y --allow-unauthenticated \ RUN apt-get update
RUN apt-get install -y --allow-unauthenticated \
libcairo2-dev libjpeg62-turbo-dev libpng-dev \ libcairo2-dev libjpeg62-turbo-dev libpng-dev \
libossp-uuid-dev libavcodec-dev libavutil-dev \ libossp-uuid-dev libavcodec-dev libavutil-dev \
libswscale-dev freerdp2-dev libfreerdp-client2-2 libpango1.0-dev \ libswscale-dev freerdp2-dev libfreerdp-client2-2 libpango1.0-dev \
libssh2-1-dev libtelnet-dev libvncserver-dev \ libssh2-1-dev libtelnet-dev libvncserver-dev \
libpulse-dev libssl-dev libvorbis-dev libwebp-dev libwebsockets-dev \ libpulse-dev libssl-dev libvorbis-dev libwebp-dev libwebsockets-dev \
ghostscript postgresql-${PG_MAJOR} \ ghostscript
&& rm -rf /var/lib/apt/lists/*
# Install Postgres
RUN apt-get install -y postgresql-${PG_MAJOR}
# Apply the s6-overlay # Apply the s6-overlay
ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-${ARCH}.tar.gz /tmp ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-${ARCH}.tar.gz /tmp
+6 -14
View File
@@ -16,18 +16,18 @@ This container runs the guacamole web client, the guacd server and a postgres da
docker run \ docker run \
-p 8080:8080 \ -p 8080:8080 \
-v </path/to/config>:/config \ -v </path/to/config>:/config \
oznu/guacamole jwetzell/guacamole
``` ```
## Raspberry Pi / ARMv6 ## Raspberry Pi / ARMv7
This image will also allow you to run [Apache Guacamole](https://guacamole.apache.org/) on a Raspberry Pi or other Docker-enabled ARMv5/6/7/8 devices by using the `armhf` tag. This image will also allow you to run [Apache Guacamole](https://guacamole.apache.org/) on a Raspberry Pi or other Docker-enabled ARMv5/6/7/8 devices by using the `arm32v7` tag.
```shell ```shell
docker run \ docker run \
-p 8080:8080 \ -p 8080:8080 \
-v </path/to/config>:/config \ -v </path/to/config>:/config \
oznu/guacamole:armhf jwetzell/guacamole:arm32v7
``` ```
## Parameters ## Parameters
@@ -49,7 +49,7 @@ docker run \
-p 8080:8080 \ -p 8080:8080 \
-v </path/to/config>:/config \ -v </path/to/config>:/config \
-e "EXTENSIONS=auth-ldap,auth-duo" -e "EXTENSIONS=auth-ldap,auth-duo"
oznu/guacamole jwetzell/guacamole
``` ```
Currently the available extensions are: Currently the available extensions are:
@@ -76,7 +76,7 @@ Mapped volumes behave differently when running Docker for Windows and you may en
version: "2" version: "2"
services: services:
guacamole: guacamole:
image: oznu/guacamole image: jwetzell/guacamole
container_name: guacamole container_name: guacamole
volumes: volumes:
- postgres:/config - postgres:/config
@@ -86,11 +86,3 @@ volumes:
postgres: postgres:
driver: local driver: local
``` ```
## License
Copyright (C) 2017-2020 oznu
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the [GNU General Public License](./LICENSE) for more details.