You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/04/04 21:01:37 UTC
[05/10] guacamole-server git commit: GUACAMOLE-407: Use Debian
(stable) instead of Ubuntu.
GUACAMOLE-407: Use Debian (stable) instead of Ubuntu.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/eb282e49
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/eb282e49
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/eb282e49
Branch: refs/heads/master
Commit: eb282e49d96c9398908147285744483c52447d1e
Parents: 2e4fb5b
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Apr 1 21:24:50 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun Apr 1 21:26:30 2018 -0700
----------------------------------------------------------------------
Dockerfile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/eb282e49/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index a456b37..ef9e033 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,9 +22,9 @@
#
-# Use Ubuntu as base for the build
-ARG UBUNTU_VERSION=artful
-FROM ubuntu:${UBUNTU_VERSION} AS builder
+# Use Debian as base for the build
+ARG DEBIAN_VERSION=stable
+FROM debian:${DEBIAN_VERSION} AS builder
# Base directory for installed build artifacts.
# Due to limitations of the Docker image build process, this value is
@@ -40,7 +40,7 @@ ARG BUILD_DEPENDENCIES=" \
gcc \
libcairo2-dev \
libfreerdp-dev \
- libjpeg-turbo8-dev \
+ libjpeg62-turbo-dev \
libossp-uuid-dev \
libpango1.0-dev \
libpulse-dev \
@@ -76,8 +76,8 @@ RUN ${PREFIX_DIR}/bin/list-dependencies.sh \
${PREFIX_DIR}/lib/freerdp/guac*.so \
> ${PREFIX_DIR}/DEPENDENCIES
-# Use same Ubuntu as the base for the runtime image
-FROM ubuntu:${UBUNTU_VERSION}
+# Use same Debian as the base for the runtime image
+FROM debian:${DEBIAN_VERSION}
# Base directory for installed build artifacts.
# Due to limitations of the Docker image build process, this value is