Conventionalizes and adds Docker integration

openzipkin · Oct 8, 2020 · 6a500d9 · 6a500d9
1 parent 69a89ad
commit 6a500d9
Show file tree

Hide file tree

Showing 23 changed files with 271 additions and 960 deletions.
diff --git a/armeria/.gitattributes → .gitattributes b/armeria/.gitattributes → .gitattributes
diff --git a/armeria/.github/CODEOWNERS → .github/CODEOWNERS b/armeria/.github/CODEOWNERS → .github/CODEOWNERS
@@ -1,3 +1,3 @@
 # https://help.github.com/articles/about-codeowners/
 
-* @adriancole @ikhoon @minwoox @trustin
+armeria/ @adriancole @ikhoon @minwoox @trustin
diff --git a/.github/workflows/docker-tests.yml b/.github/workflows/docker-tests.yml
@@ -11,7 +11,7 @@ jobs:
   build-on-linux:
     strategy:
       matrix:
-        docker-target: [webmvc25-jetty, webmvc3-jetty, webmvc4-jetty, webmvc4-boot]
+        docker-target: [armeria, webmvc25-jetty, webmvc3-jetty, webmvc4-boot, webmvc4-jetty]
     runs-on: ubuntu-latest
     name: Build and verify Docker images
     steps:

diff --git a/armeria/.gitignore b/armeria/.gitignore
diff --git a/armeria/.mvn/wrapper/MavenWrapperDownloader.java b/armeria/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/armeria/.mvn/wrapper/maven-wrapper.jar b/armeria/.mvn/wrapper/maven-wrapper.jar
diff --git a/armeria/.mvn/wrapper/maven-wrapper.properties b/armeria/.mvn/wrapper/maven-wrapper.properties
diff --git a/armeria/LICENSE b/armeria/LICENSE
diff --git a/armeria/README.md b/armeria/README.md
@@ -22,10 +22,10 @@ Next, you can view traces that went through the backend via http://localhost:941
 * This is a locally run zipkin service which keeps traces in memory
 
 ## Starting the Services
-In a separate tab or window, start each of [armeria.Frontend](/src/main/java/armeria/Frontend.java) and [armeria.Backend](/src/main/java/armeria/Backend.java):
+In a separate tab or window, start each of [Frontend](/brave/example/armeria/Frontend.java) and [Backend](/brave/example/armeria/Backend.java):
 ```bash
-$ ./mvnw compile exec:java -Dexec.mainClass=armeria.Frontend
-$ ./mvnw compile exec:java -Dexec.mainClass=armeria.Backend
+$ mvn compile exec:java -Dexec.mainClass=brave.example.Frontend
+$ mvn compile exec:java -Dexec.mainClass=brave.example.Backend
 ```
 
 Next, run [Zipkin](http://zipkin.io/), which stores and queries traces reported by the above services.