Temporarily revert ECS commits
This commit is contained in:
Moxie Marlinspike
parent
97bd9b6381
commit
a5f844bc7d
15
Dockerfile
15
Dockerfile
|
|
@ -1,15 +0,0 @@
|
||||||
FROM openjdk:8-jre
|
|
||||||
|
|
||||||
EXPOSE 8080
|
|
||||||
EXPOSE 8081
|
|
||||||
|
|
||||||
COPY target/lib /usr/share/signal/lib
|
|
||||||
|
|
||||||
ARG CONFIG_FILE
|
|
||||||
COPY config/${CONFIG_FILE} /usr/share/signal/config.yml
|
|
||||||
|
|
||||||
ARG JAR_FILE
|
|
||||||
COPY target/${JAR_FILE} /usr/share/signal/Signal-Service.jar
|
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/bin/java", "-server", "-Djava.awt.headless=true", "-Xmx2048m", "-Xss512k", "-jar", "/usr/share/signal/Signal-Service.jar", "server", "/usr/share/signal/config.yml"]
|
|
||||||
|
|
||||||
156
pom.xml
156
pom.xml
|
|
@ -192,6 +192,19 @@
|
||||||
<target>1.8</target>
|
<target>1.8</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-source-plugin</artifactId>
|
||||||
|
<version>2.2.1</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>attach-sources</id>
|
||||||
|
<goals>
|
||||||
|
<goal>jar</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
|
|
@ -199,14 +212,45 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<archive>
|
<archive>
|
||||||
<manifest>
|
<manifest>
|
||||||
<addClasspath>true</addClasspath>
|
|
||||||
<classpathPrefix>lib/</classpathPrefix>
|
|
||||||
<mainClass>org.whispersystems.textsecuregcm.WhisperServerService</mainClass>
|
|
||||||
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
|
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
|
||||||
</manifest>
|
</manifest>
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
|
<version>1.6</version>
|
||||||
|
<configuration>
|
||||||
|
<createDependencyReducedPom>true</createDependencyReducedPom>
|
||||||
|
<filters>
|
||||||
|
<filter>
|
||||||
|
<artifact>*:*</artifact>
|
||||||
|
<excludes>
|
||||||
|
<exclude>META-INF/*.SF</exclude>
|
||||||
|
<exclude>META-INF/*.DSA</exclude>
|
||||||
|
<exclude>META-INF/*.RSA</exclude>
|
||||||
|
</excludes>
|
||||||
|
</filter>
|
||||||
|
</filters>
|
||||||
|
</configuration>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>shade</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<transformers>
|
||||||
|
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
|
||||||
|
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
|
||||||
|
<mainClass>org.whispersystems.textsecuregcm.WhisperServerService</mainClass>
|
||||||
|
</transformer>
|
||||||
|
</transformers>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|
@ -215,117 +259,27 @@
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
<artifactId>maven-assembly-plugin</artifactId>
|
||||||
<version>3.1.1</version>
|
<version>2.4</version>
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>initialize</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>copy-dependencies</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<overWriteReleases>false</overWriteReleases>
|
<descriptors>
|
||||||
<includeScope>runtime</includeScope>
|
<descriptor>assembly.xml</descriptor>
|
||||||
<outputDirectory>${project.build.directory}/lib</outputDirectory>
|
</descriptors>
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>com.spotify</groupId>
|
|
||||||
<artifactId>dockerfile-maven-plugin</artifactId>
|
|
||||||
<version>1.4.8</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>production</id>
|
|
||||||
<goals>
|
|
||||||
<goal>build</goal>
|
|
||||||
<goal>push</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<repository>${ecr.repository}/signal-service</repository>
|
|
||||||
<pullNewerImage>false</pullNewerImage>
|
|
||||||
<tag>${project.version}-production</tag>
|
|
||||||
<buildArgs>
|
|
||||||
<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
|
|
||||||
<CONFIG_FILE>production.yml</CONFIG_FILE>
|
|
||||||
</buildArgs>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>staging</id>
|
|
||||||
<goals>
|
|
||||||
<goal>build</goal>
|
|
||||||
<goal>push</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<repository>${ecr.repository}/signal-service</repository>
|
|
||||||
<pullNewerImage>false</pullNewerImage>
|
|
||||||
<tag>${project.version}-staging</tag>
|
|
||||||
<buildArgs>
|
|
||||||
<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
|
|
||||||
<CONFIG_FILE>staging.yml</CONFIG_FILE>
|
|
||||||
</buildArgs>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.signal</groupId>
|
|
||||||
<artifactId>ecs-maven-plugin</artifactId>
|
|
||||||
<version>1.1-SNAPSHOT</version>
|
|
||||||
<configuration>
|
|
||||||
<awsRegion>US_EAST_1</awsRegion>
|
|
||||||
<taskFamily>signal-service</taskFamily>
|
|
||||||
<environment>staging</environment>
|
|
||||||
<version>${project.version}-staging</version>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>staging</id>
|
<id>make-assembly</id> <!-- this is used for inheritance merges -->
|
||||||
|
<phase>package</phase> <!-- bind to the packaging phase -->
|
||||||
<goals>
|
<goals>
|
||||||
<goal>create-task-revision</goal>
|
<goal>single</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
|
||||||
<environment>staging</environment>
|
|
||||||
<version>${project.version}-staging</version>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>production</id>
|
|
||||||
<goals>
|
|
||||||
<goal>create-task-revision</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<environment>production</environment>
|
|
||||||
<version>${project.version}-production</version>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-deploy-plugin</artifactId>
|
|
||||||
<version>3.0.0-M1</version>
|
|
||||||
<configuration>
|
|
||||||
<skip>true</skip>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
|
|
||||||
</plugins>
|
</plugins>
|
||||||
|
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
<pluginRepositories>
|
|
||||||
<pluginRepository>
|
|
||||||
<id>sonatype-nexus-snapshots</id>
|
|
||||||
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>true</enabled>
|
|
||||||
</snapshots>
|
|
||||||
</pluginRepository>
|
|
||||||
|
|
||||||
</pluginRepositories>
|
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
<id>gcm-server-repository</id>
|
<id>gcm-server-repository</id>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue