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:56 UTC
[1/3] incubator-guacamole-client git commit: GUACAMOLE-93: Ensure
database auth extension .jars are included in dist .tar.gz.
Repository: incubator-guacamole-client
Updated Branches:
refs/heads/master 25d259e67 -> 30639f280
GUACAMOLE-93: Ensure database auth extension .jars are included in dist .tar.gz.
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/dce39bdc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/dce39bdc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/dce39bdc
Branch: refs/heads/master
Commit: dce39bdc1ee7d7da8c4aa1b938b2ef728460a9f5
Parents: ced3083
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Aug 28 11:33:19 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun Aug 28 11:41:10 2016 -0700
----------------------------------------------------------------------
.../modules/guacamole-auth-jdbc-dist/pom.xml | 68 ++++++++++++++++++++
.../project-assembly.xml | 52 +++++++++++++++
extensions/guacamole-auth-jdbc/pom.xml | 32 +--------
.../src/main/assembly/dist.xml | 45 -------------
guacamole-docker/bin/build-guacamole.sh | 2 +-
5 files changed, 124 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/dce39bdc/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
new file mode 100644
index 0000000..32c7dfe
--- /dev/null
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
@@ -0,0 +1,68 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.guacamole</groupId>
+ <artifactId>guacamole-auth-jdbc-dist</artifactId>
+ <packaging>jar</packaging>
+ <name>guacamole-auth-jdbc-dist</name>
+ <url>http://guac-dev.org/</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <parent>
+ <groupId>org.apache.guacamole</groupId>
+ <artifactId>guacamole-auth-jdbc</artifactId>
+ <version>0.9.10-incubating</version>
+ <relativePath>../../</relativePath>
+ </parent>
+
+ <build>
+ <plugins>
+
+ <!-- Assembly plugin - for easy distribution -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.5.3</version>
+ <configuration>
+ <finalName>${project.parent.artifactId}-${project.parent.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>project-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-dist-archive</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <!-- MySQL Authentication Extension -->
+ <dependency>
+ <groupId>org.apache.guacamole</groupId>
+ <artifactId>guacamole-auth-jdbc-mysql</artifactId>
+ <version>0.9.10-incubating</version>
+ </dependency>
+
+ <!-- PostgreSQL Authentication Extension -->
+ <dependency>
+ <groupId>org.apache.guacamole</groupId>
+ <artifactId>guacamole-auth-jdbc-postgresql</artifactId>
+ <version>0.9.10-incubating</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/dce39bdc/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml
new file mode 100644
index 0000000..f69df7f
--- /dev/null
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml
@@ -0,0 +1,52 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+
+ <id>dist</id>
+ <baseDirectory>${project.parent.artifactId}-${project.parent.version}</baseDirectory>
+
+ <!-- Output .tar.gz -->
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+
+ <!-- Include extension .jars -->
+ <dependencySets>
+
+ <!-- MySQL extension .jar -->
+ <dependencySet>
+ <outputDirectory>mysql</outputDirectory>
+ <includes>
+ <include>org.apache.guacamole:guacamole-auth-jdbc-mysql</include>
+ </includes>
+ </dependencySet>
+
+ <!-- PostgreSQL extension .jar -->
+ <dependencySet>
+ <outputDirectory>postgresql</outputDirectory>
+ <includes>
+ <include>org.apache.guacamole:guacamole-auth-jdbc-postgresql</include>
+ </includes>
+ </dependencySet>
+
+ </dependencySets>
+
+ <!-- Include extension schema scripts -->
+ <fileSets>
+
+ <!-- MySQL schema scripts -->
+ <fileSet>
+ <outputDirectory>mysql/schema</outputDirectory>
+ <directory>../guacamole-auth-jdbc-mysql/schema</directory>
+ </fileSet>
+
+ <!-- PostgreSQL schema scripts -->
+ <fileSet>
+ <outputDirectory>postgresql/schema</outputDirectory>
+ <directory>../guacamole-auth-jdbc-postgresql/schema</directory>
+ </fileSet>
+
+ </fileSets>
+
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/dce39bdc/extensions/guacamole-auth-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml
index f2c1b09..37b5e3d 100644
--- a/extensions/guacamole-auth-jdbc/pom.xml
+++ b/extensions/guacamole-auth-jdbc/pom.xml
@@ -17,6 +17,9 @@
<modules>
+ <!-- Distribution .tar.gz -->
+ <module>modules/guacamole-auth-jdbc-dist</module>
+
<!-- Base JDBC classes -->
<module>modules/guacamole-auth-jdbc-base</module>
@@ -26,35 +29,6 @@
</modules>
- <build>
- <plugins>
-
- <!-- Assembly plugin - for easy distribution -->
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.3</version>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>make-dist-archive</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/dist.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-
<dependencyManagement>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/dce39bdc/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml b/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
deleted file mode 100644
index 4e72cec..0000000
--- a/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-
- <id>dist</id>
- <baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
-
- <!-- Output tar.gz -->
- <formats>
- <format>tar.gz</format>
- </formats>
-
- <!-- Include all implementations -->
- <fileSets>
-
- <!-- MySQL implementation -->
- <fileSet>
- <outputDirectory>mysql/schema</outputDirectory>
- <directory>modules/guacamole-auth-jdbc-mysql/schema</directory>
- </fileSet>
- <fileSet>
- <directory>modules/guacamole-auth-jdbc-mysql/target</directory>
- <outputDirectory>mysql</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
-
- <!-- PostgreSQL implementation -->
- <fileSet>
- <outputDirectory>postgresql/schema</outputDirectory>
- <directory>modules/guacamole-auth-jdbc-postgresql/schema</directory>
- </fileSet>
- <fileSet>
- <directory>modules/guacamole-auth-jdbc-postgresql/target</directory>
- <outputDirectory>postgresql</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
-
- </fileSets>
-
-</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/dce39bdc/guacamole-docker/bin/build-guacamole.sh
----------------------------------------------------------------------
diff --git a/guacamole-docker/bin/build-guacamole.sh b/guacamole-docker/bin/build-guacamole.sh
index 0f531e2..4df6289 100755
--- a/guacamole-docker/bin/build-guacamole.sh
+++ b/guacamole-docker/bin/build-guacamole.sh
@@ -66,7 +66,7 @@ cp guacamole/target/*.war "$DESTINATION/guacamole.war"
# Copy JDBC auth extensions and SQL scripts
#
-tar -xzf extensions/guacamole-auth-jdbc/target/*.tar.gz \
+tar -xzf extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/target/*.tar.gz \
-C "$DESTINATION" \
--wildcards \
--no-anchored \
[3/3] incubator-guacamole-client git commit: GUACAMOLE-93: Merge fix
for client docker build.
Posted by jm...@apache.org.
GUACAMOLE-93: Merge fix for client docker build.
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/30639f28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/30639f28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/30639f28
Branch: refs/heads/master
Commit: 30639f2805f656784ff82400ec86b1abadf90e12
Parents: 25d259e dce39bd
Author: James Muehlner <ja...@guac-dev.org>
Authored: Sun Aug 28 14:51:56 2016 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Sun Aug 28 14:51:56 2016 -0700
----------------------------------------------------------------------
.dockerignore | 9 +++
Dockerfile | 52 +++++++++++++++
.../modules/guacamole-auth-jdbc-dist/pom.xml | 68 ++++++++++++++++++++
.../project-assembly.xml | 52 +++++++++++++++
extensions/guacamole-auth-jdbc/pom.xml | 32 +--------
.../src/main/assembly/dist.xml | 45 -------------
guacamole-docker/.dockerignore | 3 -
guacamole-docker/.gitignore | 1 -
guacamole-docker/Dockerfile | 52 ---------------
guacamole-docker/bin/build-guacamole.sh | 2 +-
10 files changed, 185 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-guacamole-client git commit: GUACAMOLE-93: Move
Dockerfile to root of repository.
Posted by jm...@apache.org.
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" ]
-