guacamole-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmuehl...@apache.org
Subject [2/3] incubator-guacamole-server git commit: GUACAMOLE-93: Move Dockerfile to root of repository.
Date Sun, 28 Aug 2016 21:56:02 GMT
GUACAMOLE-93: Move Dockerfile to root of repository.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/4f84be1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/4f84be1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/4f84be1c

Branch: refs/heads/master
Commit: 4f84be1c312db329a1b87cca8389e29b7b3dfe48
Parents: b6a988f
Author: Michael Jumper <mjumper@apache.org>
Authored: Sun Aug 28 12:23:14 2016 -0700
Committer: Michael Jumper <mjumper@apache.org>
Committed: Sun Aug 28 14:17:26 2016 -0700

----------------------------------------------------------------------
 .dockerignore                  | 58 ++++++++++++++++++++++++
 Dockerfile                     | 89 +++++++++++++++++++++++++++++++++++++
 src/guacd-docker/.dockerignore |  3 --
 src/guacd-docker/.gitignore    |  1 -
 src/guacd-docker/Dockerfile    | 89 -------------------------------------
 5 files changed, 147 insertions(+), 93 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4f84be1c/.dockerignore
----------------------------------------------------------------------
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..3e08b9a
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,58 @@
+
+# Git repository metadata
+.git
+**/.gitignore
+
+# Object code
+**/*.o
+**/*.so
+**/*.lo
+**/*.la
+
+# gcov files
+**/*.gcda
+**/*.gcov
+**/*.gcno
+
+# Backup files
+**/*~
+
+# Release files
+**/*.tar.gz
+
+# Files currently being edited by vim or vi
+**/*.swp
+
+# automake/autoconf
+**/.deps/
+**/.dirstamp
+**/.libs/
+**/Makefile
+**/Makefile.in
+aclocal.m4
+autom4te.cache/
+m4/*
+**/!README
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
+test-driver
+
+# Test binaries
+tests/test_*
+!tests/test_*.[ch]
+
+# Generated docs
+doc/doxygen-output
+

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4f84be1c/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..adbccd3
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,89 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+#
+# Dockerfile for guacamole-server
+#
+
+# Start from CentOS base image
+FROM centos:centos7
+MAINTAINER Michael Jumper <mike.jumper@guac-dev.org>
+
+# Environment variables
+ENV \
+    BUILD_DIR=/tmp/guacd-docker-BUILD \
+    LC_ALL=en_US.UTF-8                \
+    RUNTIME_DEPENDENCIES="            \
+        cairo                         \
+        dejavu-sans-mono-fonts        \
+        freerdp                       \
+        freerdp-plugins               \
+        ghostscript                   \
+        libjpeg-turbo                 \
+        libssh2                       \
+        liberation-mono-fonts         \
+        libtelnet                     \
+        libvorbis                     \
+        libvncserver                  \
+        libwebp                       \
+        pango                         \
+        pulseaudio-libs               \
+        terminus-fonts                \
+        uuid"                         \
+    BUILD_DEPENDENCIES="              \
+        autoconf                      \
+        automake                      \
+        cairo-devel                   \
+        freerdp-devel                 \
+        gcc                           \
+        libjpeg-turbo-devel           \
+        libssh2-devel                 \
+        libtool                       \
+        libtelnet-devel               \
+        libvorbis-devel               \
+        libvncserver-devel            \
+        libwebp-devel                 \
+        make                          \
+        pango-devel                   \
+        pulseaudio-libs-devel         \
+        uuid-devel"
+
+# Bring environment up-to-date and install guacamole-server dependencies
+RUN yum -y update                        && \
+    yum -y install epel-release          && \
+    yum -y install $RUNTIME_DEPENDENCIES && \
+    yum clean all
+
+# Add configuration scripts
+COPY src/guacd-docker/bin /opt/guacd/bin/
+
+# Copy source to container for sake of build
+COPY . "$BUILD_DIR"
+
+# Build guacamole-server from local source
+RUN yum -y install $BUILD_DEPENDENCIES         && \
+    /opt/guacd/bin/build-guacd.sh "$BUILD_DIR" && \
+    rm -Rf "$BUILD_DIR"                        && \
+    yum -y autoremove $BUILD_DEPENDENCIES      && \
+    yum clean all
+
+# Start guacd, listening on port 0.0.0.0:4822
+EXPOSE 4822
+CMD [ "/usr/local/sbin/guacd", "-b", "0.0.0.0", "-f" ]
+

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4f84be1c/src/guacd-docker/.dockerignore
----------------------------------------------------------------------
diff --git a/src/guacd-docker/.dockerignore b/src/guacd-docker/.dockerignore
deleted file mode 100644
index 5792b76..0000000
--- a/src/guacd-docker/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*~
-.git
-.gitignore

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4f84be1c/src/guacd-docker/.gitignore
----------------------------------------------------------------------
diff --git a/src/guacd-docker/.gitignore b/src/guacd-docker/.gitignore
deleted file mode 100644
index b25c15b..0000000
--- a/src/guacd-docker/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4f84be1c/src/guacd-docker/Dockerfile
----------------------------------------------------------------------
diff --git a/src/guacd-docker/Dockerfile b/src/guacd-docker/Dockerfile
deleted file mode 100644
index adbccd3..0000000
--- a/src/guacd-docker/Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-#
-# Dockerfile for guacamole-server
-#
-
-# Start from CentOS base image
-FROM centos:centos7
-MAINTAINER Michael Jumper <mike.jumper@guac-dev.org>
-
-# Environment variables
-ENV \
-    BUILD_DIR=/tmp/guacd-docker-BUILD \
-    LC_ALL=en_US.UTF-8                \
-    RUNTIME_DEPENDENCIES="            \
-        cairo                         \
-        dejavu-sans-mono-fonts        \
-        freerdp                       \
-        freerdp-plugins               \
-        ghostscript                   \
-        libjpeg-turbo                 \
-        libssh2                       \
-        liberation-mono-fonts         \
-        libtelnet                     \
-        libvorbis                     \
-        libvncserver                  \
-        libwebp                       \
-        pango                         \
-        pulseaudio-libs               \
-        terminus-fonts                \
-        uuid"                         \
-    BUILD_DEPENDENCIES="              \
-        autoconf                      \
-        automake                      \
-        cairo-devel                   \
-        freerdp-devel                 \
-        gcc                           \
-        libjpeg-turbo-devel           \
-        libssh2-devel                 \
-        libtool                       \
-        libtelnet-devel               \
-        libvorbis-devel               \
-        libvncserver-devel            \
-        libwebp-devel                 \
-        make                          \
-        pango-devel                   \
-        pulseaudio-libs-devel         \
-        uuid-devel"
-
-# Bring environment up-to-date and install guacamole-server dependencies
-RUN yum -y update                        && \
-    yum -y install epel-release          && \
-    yum -y install $RUNTIME_DEPENDENCIES && \
-    yum clean all
-
-# Add configuration scripts
-COPY src/guacd-docker/bin /opt/guacd/bin/
-
-# Copy source to container for sake of build
-COPY . "$BUILD_DIR"
-
-# Build guacamole-server from local source
-RUN yum -y install $BUILD_DEPENDENCIES         && \
-    /opt/guacd/bin/build-guacd.sh "$BUILD_DIR" && \
-    rm -Rf "$BUILD_DIR"                        && \
-    yum -y autoremove $BUILD_DEPENDENCIES      && \
-    yum clean all
-
-# Start guacd, listening on port 0.0.0.0:4822
-EXPOSE 4822
-CMD [ "/usr/local/sbin/guacd", "-b", "0.0.0.0", "-f" ]
-


Mime
View raw message