You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/08/28 21:52:57 UTC
[2/3] incubator-guacamole-client git commit: GUACAMOLE-93: Move
Dockerfile to root of repository.
GUACAMOLE-93: Move Dockerfile to root of repository.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/ced30836
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/ced30836
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/ced30836
Branch: refs/heads/master
Commit: ced30836a04be0513202ea0d755b75efe3d56583
Parents: 25d259e
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Aug 27 23:19:51 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun Aug 28 11:41:10 2016 -0700
----------------------------------------------------------------------
.dockerignore | 9 +++++++
Dockerfile | 52 +++++++++++++++++++++++++++++++++++++
guacamole-docker/.dockerignore | 3 ---
guacamole-docker/.gitignore | 1 -
guacamole-docker/Dockerfile | 52 -------------------------------------
5 files changed, 61 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ced30836/.dockerignore
----------------------------------------------------------------------
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..cea1802
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,9 @@
+
+.git
+**/.gitignore
+
+**/*~
+**/target/
+**/nb-configuration.xml
+guacamole/customs.json
+
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ced30836/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..cddab01
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,52 @@
+#
+# 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-client
+#
+
+# Start from Tomcat image
+FROM tomcat:8.0.20-jre8
+MAINTAINER Michael Jumper <mi...@guac-dev.org>
+
+# Environment variables
+ENV \
+ BUILD_DIR=/tmp/guacamole-docker-BUILD \
+ BUILD_DEPENDENCIES=" \
+ maven \
+ openjdk-8-jdk-headless"
+
+# Add configuration scripts
+COPY guacamole-docker/bin /opt/guacamole/bin/
+
+# Copy source to container for sake of build
+COPY . "$BUILD_DIR"
+
+# Build latest guacamole-client and authentication
+RUN apt-get update && \
+ apt-get install -y --no-install-recommends $BUILD_DEPENDENCIES && \
+ /opt/guacamole/bin/build-guacamole.sh "$BUILD_DIR" /opt/guacamole && \
+ rm -Rf "$BUILD_DIR" && \
+ rm -Rf /var/lib/apt/lists/* && \
+ apt-get purge -y --auto-remove $BUILD_DEPENDENCIES
+
+# Start Guacamole under Tomcat, listening on 0.0.0.0:8080
+EXPOSE 8080
+CMD ["/opt/guacamole/bin/start.sh" ]
+
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ced30836/guacamole-docker/.dockerignore
----------------------------------------------------------------------
diff --git a/guacamole-docker/.dockerignore b/guacamole-docker/.dockerignore
deleted file mode 100644
index 5792b76..0000000
--- a/guacamole-docker/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*~
-.git
-.gitignore
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ced30836/guacamole-docker/.gitignore
----------------------------------------------------------------------
diff --git a/guacamole-docker/.gitignore b/guacamole-docker/.gitignore
deleted file mode 100644
index b25c15b..0000000
--- a/guacamole-docker/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ced30836/guacamole-docker/Dockerfile
----------------------------------------------------------------------
diff --git a/guacamole-docker/Dockerfile b/guacamole-docker/Dockerfile
deleted file mode 100644
index cddab01..0000000
--- a/guacamole-docker/Dockerfile
+++ /dev/null
@@ -1,52 +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-client
-#
-
-# Start from Tomcat image
-FROM tomcat:8.0.20-jre8
-MAINTAINER Michael Jumper <mi...@guac-dev.org>
-
-# Environment variables
-ENV \
- BUILD_DIR=/tmp/guacamole-docker-BUILD \
- BUILD_DEPENDENCIES=" \
- maven \
- openjdk-8-jdk-headless"
-
-# Add configuration scripts
-COPY guacamole-docker/bin /opt/guacamole/bin/
-
-# Copy source to container for sake of build
-COPY . "$BUILD_DIR"
-
-# Build latest guacamole-client and authentication
-RUN apt-get update && \
- apt-get install -y --no-install-recommends $BUILD_DEPENDENCIES && \
- /opt/guacamole/bin/build-guacamole.sh "$BUILD_DIR" /opt/guacamole && \
- rm -Rf "$BUILD_DIR" && \
- rm -Rf /var/lib/apt/lists/* && \
- apt-get purge -y --auto-remove $BUILD_DEPENDENCIES
-
-# Start Guacamole under Tomcat, listening on 0.0.0.0:8080
-EXPOSE 8080
-CMD ["/opt/guacamole/bin/start.sh" ]
-