jwetzell/docker-guacamole
1
0
Fork 0
mirror of https://github.com/jwetzell/docker-guacamole.git synced 2026-09-13 01:59:38 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Dockerfile formattinh

Browse Source
This commit is contained in:
Joel Wetzell
2022-01-23 22:39:47 -06:00
parent c17430112e
commit f2622ce529
2 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+7 -6
View File
@@ -9,11 +9,12 @@ ENV ARCH=amd64 \
POSTGRES_DB=guacamole_db POSTGRES_DB=guacamole_db
# Add Postgres Repository # Add Postgres Repository
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" >> /etc/apt/sources.list.d/pgdg.list RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" >> /etc/apt/sources.list.d/pgdg.list && \
RUN wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add - wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add -
# Install dependencies # Install dependencies
RUN apt-get update && apt-get install -y \ RUN apt-get update \
&& apt-get install -y \
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 \
@@ -25,9 +26,9 @@ RUN apt-get update && apt-get install -y \
# 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
RUN tar -xzf /tmp/s6-overlay-${ARCH}.tar.gz -C / RUN tar -xzf /tmp/s6-overlay-${ARCH}.tar.gz -C / \
RUN tar -xzf /tmp/s6-overlay-${ARCH}.tar.gz -C /usr ./bin && tar -xzf /tmp/s6-overlay-${ARCH}.tar.gz -C /usr ./bin \
RUN rm -rf /tmp/s6-overlay-${ARCH}.tar.gz && rm -rf /tmp/s6-overlay-${ARCH}.tar.gz
RUN mkdir -p ${GUACAMOLE_HOME} \ RUN mkdir -p ${GUACAMOLE_HOME} \
${GUACAMOLE_HOME}/lib \ ${GUACAMOLE_HOME}/lib \
Dockerfile.raspberry-pi
+6 -7
View File
@@ -8,10 +8,9 @@ ENV ARCH=armhf \
POSTGRES_USER=guacamole \ POSTGRES_USER=guacamole \
POSTGRES_DB=guacamole_db POSTGRES_DB=guacamole_db
# Install dependencies # Install base dependencies
RUN apt-get update RUN apt-get update \
&& apt-get install -y --allow-unauthenticated \
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 \
@@ -24,9 +23,9 @@ 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
RUN tar -xzf /tmp/s6-overlay-${ARCH}.tar.gz -C / RUN tar -xzf /tmp/s6-overlay-${ARCH}.tar.gz -C / \
RUN tar -xzf /tmp/s6-overlay-${ARCH}.tar.gz -C /usr ./bin && tar -xzf /tmp/s6-overlay-${ARCH}.tar.gz -C /usr ./bin \
RUN rm -rf /tmp/s6-overlay-${ARCH}.tar.gz && rm -rf /tmp/s6-overlay-${ARCH}.tar.gz
RUN mkdir -p ${GUACAMOLE_HOME} \ RUN mkdir -p ${GUACAMOLE_HOME} \
${GUACAMOLE_HOME}/lib \ ${GUACAMOLE_HOME}/lib \