From cdb78f3ffcd5846bb9fd00b3895299d98994a3df Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Thu, 25 Jul 2019 14:22:35 +0800 Subject: [PATCH 01/22] - Configure remote repository - Added dockerfile to deploy to remote repository --- Dockerfile | 25 +++++++++++++++++++++++++ pom.xml | 31 ++++++++++++++++++------------- 2 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000..71137f6d7e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,25 @@ +# wego-async-http-client stage +FROM maven:3.6-jdk-11-slim as wego-async-http-client + +# Install build dependencies +RUN apt-get -qq update && \ + apt-get -qq install -y --no-install-recommends \ + build-essential \ + git \ + openssh-client \ + locales \ + wget \ + && rm -rf /var/lib/apt/lists/* + +# Read repo args +ARG AWS_DEFAULT_REGION +ARG AWS_ACCESS_KEY_ID +ARG AWS_SECRET_ACCESS_KEY +ARG SNAPSHOTS_URL +ENV AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} +ENV AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} + +WORKDIR /app +COPY . . + +RUN mvn -X deploy -U -Dmaven.test.skip=true -Dgpg.skip -DdistMgmtSnapshotsUrl=${SNAPSHOTS_URL} -DAWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} diff --git a/pom.xml b/pom.xml index ce6249110e..73df46ec3f 100644 --- a/pom.xml +++ b/pom.xml @@ -77,6 +77,11 @@ maven-scm-manager-plexus 1.6 + + com.gkatzioura.maven.cloud + s3-storage-wagon + 1.8 + install @@ -194,19 +199,18 @@ - - - sonatype-nexus-staging - Sonatype Release - http://oss.sonatype.org/service/local/staging/deploy/maven2 - - - - sonatype-nexus-snapshots - sonatype-nexus-snapshots - ${distMgmtSnapshotsUrl} - - + + + dist-release + dist-release + ${distMgmtReleasesUrl} + + + dist-snapshots + dist-snapshots + ${distMgmtSnapshotsUrl} + + netty-utils client @@ -399,6 +403,7 @@ http://oss.sonatype.org/content/repositories/snapshots + true 1.8 1.8 From 0e18c7cfd6c37be586e6cf776245a03d056d86b9 Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Fri, 26 Jul 2019 13:34:21 +0800 Subject: [PATCH 02/22] Parameterized artifact version --- Dockerfile | 7 ++++--- client/pom.xml | 2 +- example/pom.xml | 2 +- extras/guava/pom.xml | 2 +- extras/jdeferred/pom.xml | 2 +- extras/pom.xml | 9 +-------- extras/registry/pom.xml | 2 +- extras/retrofit2/pom.xml | 2 +- extras/rxjava/pom.xml | 2 +- extras/rxjava2/pom.xml | 2 +- extras/simple/pom.xml | 2 +- extras/typesafeconfig/pom.xml | 2 +- netty-utils/pom.xml | 2 +- pom.xml | 5 +++-- 14 files changed, 19 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 71137f6d7e..0509589dfa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # wego-async-http-client stage -FROM maven:3.6-jdk-11-slim as wego-async-http-client +FROM maven:3.6-jdk-11-slim as builder # Install build dependencies RUN apt-get -qq update && \ @@ -12,14 +12,15 @@ RUN apt-get -qq update && \ && rm -rf /var/lib/apt/lists/* # Read repo args +ARG VERSION ARG AWS_DEFAULT_REGION ARG AWS_ACCESS_KEY_ID ARG AWS_SECRET_ACCESS_KEY -ARG SNAPSHOTS_URL +ARG RELEASE_URL ENV AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} ENV AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} WORKDIR /app COPY . . -RUN mvn -X deploy -U -Dmaven.test.skip=true -Dgpg.skip -DdistMgmtSnapshotsUrl=${SNAPSHOTS_URL} -DAWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} +RUN mvn deploy -U -Dmaven.test.skip=true -Dgpg.skip -DdistMgmtReleasesUrl=${RELEASE_URL} -DAWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} -Dversion=${VERSION} diff --git a/client/pom.xml b/client/pom.xml index da97920051..a2ad9553ac 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -2,7 +2,7 @@ org.asynchttpclient async-http-client-project - 2.5.3-SNAPSHOT + ${version} 4.0.0 async-http-client diff --git a/example/pom.xml b/example/pom.xml index 075bc60bea..72c281699d 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -2,7 +2,7 @@ org.asynchttpclient async-http-client-project - 2.5.3-SNAPSHOT + ${version} 4.0.0 async-http-client-example diff --git a/extras/guava/pom.xml b/extras/guava/pom.xml index 151393daef..bc85629422 100644 --- a/extras/guava/pom.xml +++ b/extras/guava/pom.xml @@ -2,7 +2,7 @@ org.asynchttpclient async-http-client-extras-parent - 2.5.3-SNAPSHOT + ${version} 4.0.0 async-http-client-extras-guava diff --git a/extras/jdeferred/pom.xml b/extras/jdeferred/pom.xml index aefd9cd662..d399821f27 100644 --- a/extras/jdeferred/pom.xml +++ b/extras/jdeferred/pom.xml @@ -18,7 +18,7 @@ async-http-client-extras-parent org.asynchttpclient - 2.5.3-SNAPSHOT + ${version} async-http-client-extras-jdeferred Asynchronous Http Client JDeferred Extras diff --git a/extras/pom.xml b/extras/pom.xml index 5443b9ffcc..d9ab6f6cb7 100644 --- a/extras/pom.xml +++ b/extras/pom.xml @@ -2,7 +2,7 @@ org.asynchttpclient async-http-client-project - 2.5.3-SNAPSHOT + ${version} 4.0.0 async-http-client-extras-parent @@ -29,12 +29,5 @@ async-http-client ${project.version} - - org.asynchttpclient - async-http-client - ${project.version} - test - tests - diff --git a/extras/registry/pom.xml b/extras/registry/pom.xml index 995d6b21f5..f78b35f38e 100644 --- a/extras/registry/pom.xml +++ b/extras/registry/pom.xml @@ -2,7 +2,7 @@ org.asynchttpclient async-http-client-extras-parent - 2.5.3-SNAPSHOT + ${version} 4.0.0 async-http-client-extras-registry diff --git a/extras/retrofit2/pom.xml b/extras/retrofit2/pom.xml index 9322cb6e7e..8af648c090 100644 --- a/extras/retrofit2/pom.xml +++ b/extras/retrofit2/pom.xml @@ -4,7 +4,7 @@ async-http-client-extras-parent org.asynchttpclient - 2.5.3-SNAPSHOT + ${version} async-http-client-extras-retrofit2 diff --git a/extras/rxjava/pom.xml b/extras/rxjava/pom.xml index 9225a76d1d..5cd4ce55b3 100644 --- a/extras/rxjava/pom.xml +++ b/extras/rxjava/pom.xml @@ -3,7 +3,7 @@ async-http-client-extras-parent org.asynchttpclient - 2.5.3-SNAPSHOT + ${version} async-http-client-extras-rxjava Asynchronous Http Client RxJava Extras diff --git a/extras/rxjava2/pom.xml b/extras/rxjava2/pom.xml index f165dc1725..1bb031aa15 100644 --- a/extras/rxjava2/pom.xml +++ b/extras/rxjava2/pom.xml @@ -3,7 +3,7 @@ async-http-client-extras-parent org.asynchttpclient - 2.5.3-SNAPSHOT + ${version} async-http-client-extras-rxjava2 Asynchronous Http Client RxJava2 Extras diff --git a/extras/simple/pom.xml b/extras/simple/pom.xml index 05c1ac0d1f..ffca7fdd23 100644 --- a/extras/simple/pom.xml +++ b/extras/simple/pom.xml @@ -3,7 +3,7 @@ async-http-client-extras-parent org.asynchttpclient - 2.5.3-SNAPSHOT + ${version} async-http-client-extras-simple Asynchronous Http Simple Client diff --git a/extras/typesafeconfig/pom.xml b/extras/typesafeconfig/pom.xml index d121e009c5..f9cb68a42a 100644 --- a/extras/typesafeconfig/pom.xml +++ b/extras/typesafeconfig/pom.xml @@ -4,7 +4,7 @@ async-http-client-extras-parent org.asynchttpclient - 2.5.3-SNAPSHOT + ${version} async-http-client-extras-typesafe-config diff --git a/netty-utils/pom.xml b/netty-utils/pom.xml index 79aa56d555..f9434bc197 100644 --- a/netty-utils/pom.xml +++ b/netty-utils/pom.xml @@ -2,7 +2,7 @@ org.asynchttpclient async-http-client-project - 2.5.3-SNAPSHOT + ${version} 4.0.0 async-http-client-netty-utils diff --git a/pom.xml b/pom.xml index 73df46ec3f..d27bd3a1a3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.asynchttpclient async-http-client-project Asynchronous Http Client Project - 2.5.3-SNAPSHOT + ${version} pom The Async Http Client (AHC) library's purpose is to allow Java @@ -402,8 +402,9 @@ + http://oss.sonatype.org/content/repositories/snapshots - + http://oss.sonatype.org/content/repositories/releases true 1.8 1.8 From cb857f69baa15bbd75f37a97f0756b7dc564220e Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Fri, 26 Jul 2019 17:58:37 +0800 Subject: [PATCH 03/22] Added maven flatten plugin --- Dockerfile | 9 +++++++-- client/pom.xml | 2 +- example/pom.xml | 2 +- extras/guava/pom.xml | 4 ++-- extras/jdeferred/pom.xml | 2 +- extras/pom.xml | 2 +- extras/registry/pom.xml | 4 ++-- extras/retrofit2/pom.xml | 2 +- extras/rxjava/pom.xml | 2 +- extras/rxjava2/pom.xml | 2 +- extras/simple/pom.xml | 2 +- extras/typesafeconfig/pom.xml | 2 +- netty-utils/pom.xml | 2 +- pom.xml | 26 +++++++++++++++++++++++++- 14 files changed, 46 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0509589dfa..5ce6c98c45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,11 +16,16 @@ ARG VERSION ARG AWS_DEFAULT_REGION ARG AWS_ACCESS_KEY_ID ARG AWS_SECRET_ACCESS_KEY -ARG RELEASE_URL +ARG REPO_URL ENV AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} ENV AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} WORKDIR /app COPY . . -RUN mvn deploy -U -Dmaven.test.skip=true -Dgpg.skip -DdistMgmtReleasesUrl=${RELEASE_URL} -DAWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} -Dversion=${VERSION} +RUN mvn deploy -U \ + -Dmaven.test.skip=true \ + -Dgpg.skip \ + -DdistMgmtReleasesUrl=${REPO_URL}/releases \ + -DAWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \ + -Dproject.version=${VERSION} diff --git a/client/pom.xml b/client/pom.xml index a2ad9553ac..5b635deae0 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -2,7 +2,7 @@ org.asynchttpclient async-http-client-project - ${version} + ${project.version} 4.0.0 async-http-client diff --git a/example/pom.xml b/example/pom.xml index 72c281699d..73b6634b17 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -2,7 +2,7 @@ org.asynchttpclient async-http-client-project - ${version} + ${project.version} 4.0.0 async-http-client-example diff --git a/extras/guava/pom.xml b/extras/guava/pom.xml index bc85629422..0772632804 100644 --- a/extras/guava/pom.xml +++ b/extras/guava/pom.xml @@ -2,7 +2,7 @@ org.asynchttpclient async-http-client-extras-parent - ${version} + ${project.version} 4.0.0 async-http-client-extras-guava @@ -18,4 +18,4 @@ 14.0.1 - \ No newline at end of file + diff --git a/extras/jdeferred/pom.xml b/extras/jdeferred/pom.xml index d399821f27..0a220f8db1 100644 --- a/extras/jdeferred/pom.xml +++ b/extras/jdeferred/pom.xml @@ -18,7 +18,7 @@ async-http-client-extras-parent org.asynchttpclient - ${version} + ${project.version} async-http-client-extras-jdeferred Asynchronous Http Client JDeferred Extras diff --git a/extras/pom.xml b/extras/pom.xml index d9ab6f6cb7..01bd9b7879 100644 --- a/extras/pom.xml +++ b/extras/pom.xml @@ -2,7 +2,7 @@ org.asynchttpclient async-http-client-project - ${version} + ${project.version} 4.0.0 async-http-client-extras-parent diff --git a/extras/registry/pom.xml b/extras/registry/pom.xml index f78b35f38e..42feb12137 100644 --- a/extras/registry/pom.xml +++ b/extras/registry/pom.xml @@ -2,7 +2,7 @@ org.asynchttpclient async-http-client-extras-parent - ${version} + ${project.version} 4.0.0 async-http-client-extras-registry @@ -10,4 +10,4 @@ The Async Http Client Registry Extras. - \ No newline at end of file + diff --git a/extras/retrofit2/pom.xml b/extras/retrofit2/pom.xml index 8af648c090..bd286c70d8 100644 --- a/extras/retrofit2/pom.xml +++ b/extras/retrofit2/pom.xml @@ -4,7 +4,7 @@ async-http-client-extras-parent org.asynchttpclient - ${version} + ${project.version} async-http-client-extras-retrofit2 diff --git a/extras/rxjava/pom.xml b/extras/rxjava/pom.xml index 5cd4ce55b3..f24287e44a 100644 --- a/extras/rxjava/pom.xml +++ b/extras/rxjava/pom.xml @@ -3,7 +3,7 @@ async-http-client-extras-parent org.asynchttpclient - ${version} + ${project.version} async-http-client-extras-rxjava Asynchronous Http Client RxJava Extras diff --git a/extras/rxjava2/pom.xml b/extras/rxjava2/pom.xml index 1bb031aa15..51387bb176 100644 --- a/extras/rxjava2/pom.xml +++ b/extras/rxjava2/pom.xml @@ -3,7 +3,7 @@ async-http-client-extras-parent org.asynchttpclient - ${version} + ${project.version} async-http-client-extras-rxjava2 Asynchronous Http Client RxJava2 Extras diff --git a/extras/simple/pom.xml b/extras/simple/pom.xml index ffca7fdd23..222d5ccd84 100644 --- a/extras/simple/pom.xml +++ b/extras/simple/pom.xml @@ -3,7 +3,7 @@ async-http-client-extras-parent org.asynchttpclient - ${version} + ${project.version} async-http-client-extras-simple Asynchronous Http Simple Client diff --git a/extras/typesafeconfig/pom.xml b/extras/typesafeconfig/pom.xml index f9cb68a42a..fea014f820 100644 --- a/extras/typesafeconfig/pom.xml +++ b/extras/typesafeconfig/pom.xml @@ -4,7 +4,7 @@ async-http-client-extras-parent org.asynchttpclient - ${version} + ${project.version} async-http-client-extras-typesafe-config diff --git a/netty-utils/pom.xml b/netty-utils/pom.xml index f9434bc197..418e0c8743 100644 --- a/netty-utils/pom.xml +++ b/netty-utils/pom.xml @@ -2,7 +2,7 @@ org.asynchttpclient async-http-client-project - ${version} + ${project.version} 4.0.0 async-http-client-netty-utils diff --git a/pom.xml b/pom.xml index d27bd3a1a3..8bd9bd1b76 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.asynchttpclient async-http-client-project Asynchronous Http Client Project - ${version} + ${project.version} pom The Async Http Client (AHC) library's purpose is to allow Java @@ -156,6 +156,30 @@ + + org.codehaus.mojo + flatten-maven-plugin + 1.0.0 + + true + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + From 33e089382baf2cf9ee2fbb23aab1e4d537459b10 Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Thu, 1 Aug 2019 14:56:33 +0800 Subject: [PATCH 04/22] Hardcoded version in org.asynchttpclient test dependency --- Dockerfile | 4 ++-- extras/pom.xml | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5ce6c98c45..e5c3ecbad3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get -qq update && \ && rm -rf /var/lib/apt/lists/* # Read repo args -ARG VERSION +ARG REVISION ARG AWS_DEFAULT_REGION ARG AWS_ACCESS_KEY_ID ARG AWS_SECRET_ACCESS_KEY @@ -28,4 +28,4 @@ RUN mvn deploy -U \ -Dgpg.skip \ -DdistMgmtReleasesUrl=${REPO_URL}/releases \ -DAWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \ - -Dproject.version=${VERSION} + -Dproject.version=${REVISION} diff --git a/extras/pom.xml b/extras/pom.xml index 01bd9b7879..b2f1c843f0 100644 --- a/extras/pom.xml +++ b/extras/pom.xml @@ -29,5 +29,12 @@ async-http-client ${project.version} + + org.asynchttpclient + async-http-client + 2.5.3-SNAPSHOT + test + tests + From 6fd3da9b733eccef3919f857ab5aa4b0f2b42a94 Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Mon, 5 Aug 2019 14:20:27 +0800 Subject: [PATCH 05/22] Removed multi-stage build name from dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e5c3ecbad3..34b0ff5e91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # wego-async-http-client stage -FROM maven:3.6-jdk-11-slim as builder +FROM maven:3.6-jdk-11-slim # Install build dependencies RUN apt-get -qq update && \ From 268cb2ad3f4698856ae90da4d5486bab0e5c76b1 Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Wed, 21 Aug 2019 18:57:48 +0800 Subject: [PATCH 06/22] Updated travis to use docker --- .travis.yml | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb8adf60b0..9b743e76de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,28 +1,26 @@ -language: java -jdk: - - oraclejdk8 +dist: xenial +language: minimal +sudo: true +services: +- docker -before_script: - - travis/before_script.sh +env: + global: + - SERVICE_NAME=asyc-http-client + - AWS_DEFAULT_REGION=ap-southeast-1 + - secure: LkF6B+nBS6hUpb/E6uaXvKcai8Bw46sGJknfVj5W+0Q6ifhI+tDxRkh7Ug+VPmD+zberfJ1zczSBnCitS+POb3JhVBpuuXaec6WppAf6HamoJZHUU3EOAu22RjY60AMx9ACR4ZDvuSDq72Og2IGZHuDYd+Pp+fCb/4sKZfXG5PrYH1xaW1WhZYlq+G8J6KEjqObeZr2q77WyzJnwPmfSleuSiqBFsotQAgSYP+0BtZ2YlsqhdasHkcZWKlVH/PFGwItBgK5g63SLJaVBOoXx/Jm448N/ybubkmSXj1MHgMi4NsjS+IM5wD/tNQ/cAy0ilb94amQFIXy8La07bAqYV5Xzx2HOvUA+IkZKtGfXHR3RgtAUQb2U8B1J3tp06fk+CZAPiy8hk9GnKV5uV3g/QjC2FzzjzFSEIHLxEzHPTHlgXfIasMowAwr+E2iZUweP0EVYfY7D9lUcc5yNg8TnkTt5NgSaCnKsYsI5JfjzBNUBfcZzsgC8Z5yiC0ZVLiLFzt/WUaBnvzuzFq9vq/A8YwyZ8/ktqcRSc4+C09sfLZxSz9+HjA7ZY2C3GTjOgw3ApIGCCLXNiKLdn878Dl0cA1wNeAojfodtniEeMnrDs9i9jME7P6nkB+f4WnHzG8RBsAZZwkVGxkQeIsNP5a/ABAP/YLGPDVDpV2HI/cLUQro= + - secure: l2qENS1Eoc7Y9cYUlN/HUZgAnsz3qizA2xh+H4OUdMlXYbf+deS9bCUWEJB/6FDhAEx25SeJWTvf90e6E7B18mktS6BoH+tAbxF/JP8NN+MxGfGRDtOiP9GdWrwy0RzFpGZldOizfy6GNEFxi1wtE95Dm4XIsJu17IRdt6AS9bJZ3Vm3fRifJrS/c6OmeWRGHXx1ftlBClVDgb987+u8I7PJ9WQ+rgKjJvZ4PaBRxAZVKnHN0olU/OJr/zSdtygXUN4q7b9kPpf7Uc4ZFWj3K7Fh0kfEdxZILBz/B6Zr//Ht7KWQAQ61yH+NO2VHCHD5/nGfk4cQ7PuE4SdoUlq/Jf8NheY/eXujFoakrxo2UtYOl+kRk0Z7s+1XryekLrEkEF3gvovSYAB1Ln1NR/0ccLbOXtNFMwDomNkiHKcx5txWZGohLhL9yn1hhOtHwBZ7+8qUe5WsuCSpgoJ5cU3JGeW/o/F3bBoLT5m3Ff4y889cWLHoW0nCgbyp0FXulNy4IOR0j2JTuihI8H2/ZnDEQpVV7HFlSR7mgJq23e0lSEMZXvbRo2+iLR766uM7GPyYKpGHJ3nEW5wMaWQocyvPThMxu8XVqGk+q56MOA8G7gSMkSWIzqJwHLmm+YEdJgklWj9epX3V2rUXjtSP4L5jvKu8IKZ9qLaHeu+fbDIxvRs= + - secure: XrNa9rZ8SRsF+BmNMNyPThLwq9MzfIAK5C3zSGNxF4LBXpCet8xS1zfS/WUjhVIQnvRdgJvgcbZSswkj8lyZpI9WcCTyYH+eMdZf6kmyg2Adkygh3y23aN5/2EuAbsPckSc+U9EWjymEDEcbuIlDZ/+bhSpgo2J1UBwXuiY4TP9LyEPWrSP3DxCf3Bu1VyLnbvaQEy6xC4m1akutyCnBfkAWwQUbf7AQhXvLtkdNuw48mltcw2Itl3qgvA1dMXE06qGg68lNX3u2Bvwo7v8sylHrW2J+FbOOg7tT4Ru9SXFE9v37Lq45Y1tP1TXTjRyiOEeuUajBw85XU1a/xisdXZwGaXeqf50f3R/KPQj8oeBgCoA4xgy3YRTTx1QB0Aj/9I5cA7IY9Ld4R1RYM4jNni2vUZANOEqIqC8Gwh1EOoqfcQcTewnVRm/2gGnMg+dsSpX6REmUpqx4ivOrI1CGUasEg46+4y+LcKPBQI56EvxEKZ1YaXRqzd6kBGsDxriqlvz8pGbpds9skcIuB3W54jDweHv88XkSZD8fdUkMJyHdatQYxchujqH9MeQpeiXT/jwYEJxXCRcJ2OCJOj+xGqQmvwo5Ubect0QDm0kwOFYJ0LCqGONUtc4tkUuYxmIgJ4Yhb5mwvo7LGC4ypxhxRimmUkE4Pa7wL03YR2k9l+Y= -script: - - mvn test -Ptest-output - - find $HOME/.m2 -name "_remote.repositories" | xargs rm - - find $HOME/.m2 -name "resolver-status.properties" | xargs rm -f - -# If building master, Publish to Sonatype -after_success: - - travis/after_success.sh - -sudo: false - -# https://github.com/travis-ci/travis-ci/issues/3259 -addons: - apt: - packages: - - oracle-java8-installer - -# Cache settings cache: directories: - - $HOME/.m2/repository + - build-cache + +script: +- docker build . --build-arg AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} --build-arg AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} + --build-arg REPO_URL=${REPO_URL} --build-arg REVISION=${TRAVIS_COMMIT} --build-arg + AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} + +before_cache: +- docker-compose -f docker-compose.yml run --rm -v `pwd`/build-cache:/app/build-cache + ${SERVICE_NAME} bash docker-utils.sh save-cache From 4f2c31ff7e2a568077beff398a4b1b8db4520cb5 Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Fri, 23 Aug 2019 10:28:43 +0800 Subject: [PATCH 07/22] Added aws_session_token support --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 34b0ff5e91..e53065e31d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,9 +16,11 @@ ARG REVISION ARG AWS_DEFAULT_REGION ARG AWS_ACCESS_KEY_ID ARG AWS_SECRET_ACCESS_KEY +ARG AWS_SESSION_TOKEN ARG REPO_URL ENV AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} ENV AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} +ENV AWS_SESSION_TOKEN=${AWS_SESSION_TOKEN} WORKDIR /app COPY . . From 7c53d3356bb917cabdb3468f98de63b6f06a9699 Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Tue, 27 Aug 2019 18:52:04 +0800 Subject: [PATCH 08/22] Configured default version --- Dockerfile | 1 + pom.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index e53065e31d..025c557ca3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,5 +29,6 @@ RUN mvn deploy -U \ -Dmaven.test.skip=true \ -Dgpg.skip \ -DdistMgmtReleasesUrl=${REPO_URL}/releases \ + -DdistMgmtSnapshotsUrl=${REPO_URL}/snapshots \ -DAWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \ -Dproject.version=${REVISION} diff --git a/pom.xml b/pom.xml index 8bd9bd1b76..4b7d7b8bb7 100644 --- a/pom.xml +++ b/pom.xml @@ -427,6 +427,7 @@ + 2.5.3-SNAPSHOT http://oss.sonatype.org/content/repositories/snapshots http://oss.sonatype.org/content/repositories/releases true From 37768de0c1615c93ba5e903e8bb598677176ec08 Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Wed, 28 Aug 2019 12:56:01 +0800 Subject: [PATCH 09/22] Beautify travis file --- .travis.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b743e76de..ecc9908e68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,25 +2,27 @@ dist: xenial language: minimal sudo: true services: -- docker + - docker env: global: - - SERVICE_NAME=asyc-http-client - - AWS_DEFAULT_REGION=ap-southeast-1 - - secure: LkF6B+nBS6hUpb/E6uaXvKcai8Bw46sGJknfVj5W+0Q6ifhI+tDxRkh7Ug+VPmD+zberfJ1zczSBnCitS+POb3JhVBpuuXaec6WppAf6HamoJZHUU3EOAu22RjY60AMx9ACR4ZDvuSDq72Og2IGZHuDYd+Pp+fCb/4sKZfXG5PrYH1xaW1WhZYlq+G8J6KEjqObeZr2q77WyzJnwPmfSleuSiqBFsotQAgSYP+0BtZ2YlsqhdasHkcZWKlVH/PFGwItBgK5g63SLJaVBOoXx/Jm448N/ybubkmSXj1MHgMi4NsjS+IM5wD/tNQ/cAy0ilb94amQFIXy8La07bAqYV5Xzx2HOvUA+IkZKtGfXHR3RgtAUQb2U8B1J3tp06fk+CZAPiy8hk9GnKV5uV3g/QjC2FzzjzFSEIHLxEzHPTHlgXfIasMowAwr+E2iZUweP0EVYfY7D9lUcc5yNg8TnkTt5NgSaCnKsYsI5JfjzBNUBfcZzsgC8Z5yiC0ZVLiLFzt/WUaBnvzuzFq9vq/A8YwyZ8/ktqcRSc4+C09sfLZxSz9+HjA7ZY2C3GTjOgw3ApIGCCLXNiKLdn878Dl0cA1wNeAojfodtniEeMnrDs9i9jME7P6nkB+f4WnHzG8RBsAZZwkVGxkQeIsNP5a/ABAP/YLGPDVDpV2HI/cLUQro= - - secure: l2qENS1Eoc7Y9cYUlN/HUZgAnsz3qizA2xh+H4OUdMlXYbf+deS9bCUWEJB/6FDhAEx25SeJWTvf90e6E7B18mktS6BoH+tAbxF/JP8NN+MxGfGRDtOiP9GdWrwy0RzFpGZldOizfy6GNEFxi1wtE95Dm4XIsJu17IRdt6AS9bJZ3Vm3fRifJrS/c6OmeWRGHXx1ftlBClVDgb987+u8I7PJ9WQ+rgKjJvZ4PaBRxAZVKnHN0olU/OJr/zSdtygXUN4q7b9kPpf7Uc4ZFWj3K7Fh0kfEdxZILBz/B6Zr//Ht7KWQAQ61yH+NO2VHCHD5/nGfk4cQ7PuE4SdoUlq/Jf8NheY/eXujFoakrxo2UtYOl+kRk0Z7s+1XryekLrEkEF3gvovSYAB1Ln1NR/0ccLbOXtNFMwDomNkiHKcx5txWZGohLhL9yn1hhOtHwBZ7+8qUe5WsuCSpgoJ5cU3JGeW/o/F3bBoLT5m3Ff4y889cWLHoW0nCgbyp0FXulNy4IOR0j2JTuihI8H2/ZnDEQpVV7HFlSR7mgJq23e0lSEMZXvbRo2+iLR766uM7GPyYKpGHJ3nEW5wMaWQocyvPThMxu8XVqGk+q56MOA8G7gSMkSWIzqJwHLmm+YEdJgklWj9epX3V2rUXjtSP4L5jvKu8IKZ9qLaHeu+fbDIxvRs= - - secure: XrNa9rZ8SRsF+BmNMNyPThLwq9MzfIAK5C3zSGNxF4LBXpCet8xS1zfS/WUjhVIQnvRdgJvgcbZSswkj8lyZpI9WcCTyYH+eMdZf6kmyg2Adkygh3y23aN5/2EuAbsPckSc+U9EWjymEDEcbuIlDZ/+bhSpgo2J1UBwXuiY4TP9LyEPWrSP3DxCf3Bu1VyLnbvaQEy6xC4m1akutyCnBfkAWwQUbf7AQhXvLtkdNuw48mltcw2Itl3qgvA1dMXE06qGg68lNX3u2Bvwo7v8sylHrW2J+FbOOg7tT4Ru9SXFE9v37Lq45Y1tP1TXTjRyiOEeuUajBw85XU1a/xisdXZwGaXeqf50f3R/KPQj8oeBgCoA4xgy3YRTTx1QB0Aj/9I5cA7IY9Ld4R1RYM4jNni2vUZANOEqIqC8Gwh1EOoqfcQcTewnVRm/2gGnMg+dsSpX6REmUpqx4ivOrI1CGUasEg46+4y+LcKPBQI56EvxEKZ1YaXRqzd6kBGsDxriqlvz8pGbpds9skcIuB3W54jDweHv88XkSZD8fdUkMJyHdatQYxchujqH9MeQpeiXT/jwYEJxXCRcJ2OCJOj+xGqQmvwo5Ubect0QDm0kwOFYJ0LCqGONUtc4tkUuYxmIgJ4Yhb5mwvo7LGC4ypxhxRimmUkE4Pa7wL03YR2k9l+Y= + - SERVICE_NAME=asyc-http-client + - AWS_DEFAULT_REGION=ap-southeast-1 + - secure: LkF6B+nBS6hUpb/E6uaXvKcai8Bw46sGJknfVj5W+0Q6ifhI+tDxRkh7Ug+VPmD+zberfJ1zczSBnCitS+POb3JhVBpuuXaec6WppAf6HamoJZHUU3EOAu22RjY60AMx9ACR4ZDvuSDq72Og2IGZHuDYd+Pp+fCb/4sKZfXG5PrYH1xaW1WhZYlq+G8J6KEjqObeZr2q77WyzJnwPmfSleuSiqBFsotQAgSYP+0BtZ2YlsqhdasHkcZWKlVH/PFGwItBgK5g63SLJaVBOoXx/Jm448N/ybubkmSXj1MHgMi4NsjS+IM5wD/tNQ/cAy0ilb94amQFIXy8La07bAqYV5Xzx2HOvUA+IkZKtGfXHR3RgtAUQb2U8B1J3tp06fk+CZAPiy8hk9GnKV5uV3g/QjC2FzzjzFSEIHLxEzHPTHlgXfIasMowAwr+E2iZUweP0EVYfY7D9lUcc5yNg8TnkTt5NgSaCnKsYsI5JfjzBNUBfcZzsgC8Z5yiC0ZVLiLFzt/WUaBnvzuzFq9vq/A8YwyZ8/ktqcRSc4+C09sfLZxSz9+HjA7ZY2C3GTjOgw3ApIGCCLXNiKLdn878Dl0cA1wNeAojfodtniEeMnrDs9i9jME7P6nkB+f4WnHzG8RBsAZZwkVGxkQeIsNP5a/ABAP/YLGPDVDpV2HI/cLUQro= + - secure: l2qENS1Eoc7Y9cYUlN/HUZgAnsz3qizA2xh+H4OUdMlXYbf+deS9bCUWEJB/6FDhAEx25SeJWTvf90e6E7B18mktS6BoH+tAbxF/JP8NN+MxGfGRDtOiP9GdWrwy0RzFpGZldOizfy6GNEFxi1wtE95Dm4XIsJu17IRdt6AS9bJZ3Vm3fRifJrS/c6OmeWRGHXx1ftlBClVDgb987+u8I7PJ9WQ+rgKjJvZ4PaBRxAZVKnHN0olU/OJr/zSdtygXUN4q7b9kPpf7Uc4ZFWj3K7Fh0kfEdxZILBz/B6Zr//Ht7KWQAQ61yH+NO2VHCHD5/nGfk4cQ7PuE4SdoUlq/Jf8NheY/eXujFoakrxo2UtYOl+kRk0Z7s+1XryekLrEkEF3gvovSYAB1Ln1NR/0ccLbOXtNFMwDomNkiHKcx5txWZGohLhL9yn1hhOtHwBZ7+8qUe5WsuCSpgoJ5cU3JGeW/o/F3bBoLT5m3Ff4y889cWLHoW0nCgbyp0FXulNy4IOR0j2JTuihI8H2/ZnDEQpVV7HFlSR7mgJq23e0lSEMZXvbRo2+iLR766uM7GPyYKpGHJ3nEW5wMaWQocyvPThMxu8XVqGk+q56MOA8G7gSMkSWIzqJwHLmm+YEdJgklWj9epX3V2rUXjtSP4L5jvKu8IKZ9qLaHeu+fbDIxvRs= + - secure: XrNa9rZ8SRsF+BmNMNyPThLwq9MzfIAK5C3zSGNxF4LBXpCet8xS1zfS/WUjhVIQnvRdgJvgcbZSswkj8lyZpI9WcCTyYH+eMdZf6kmyg2Adkygh3y23aN5/2EuAbsPckSc+U9EWjymEDEcbuIlDZ/+bhSpgo2J1UBwXuiY4TP9LyEPWrSP3DxCf3Bu1VyLnbvaQEy6xC4m1akutyCnBfkAWwQUbf7AQhXvLtkdNuw48mltcw2Itl3qgvA1dMXE06qGg68lNX3u2Bvwo7v8sylHrW2J+FbOOg7tT4Ru9SXFE9v37Lq45Y1tP1TXTjRyiOEeuUajBw85XU1a/xisdXZwGaXeqf50f3R/KPQj8oeBgCoA4xgy3YRTTx1QB0Aj/9I5cA7IY9Ld4R1RYM4jNni2vUZANOEqIqC8Gwh1EOoqfcQcTewnVRm/2gGnMg+dsSpX6REmUpqx4ivOrI1CGUasEg46+4y+LcKPBQI56EvxEKZ1YaXRqzd6kBGsDxriqlvz8pGbpds9skcIuB3W54jDweHv88XkSZD8fdUkMJyHdatQYxchujqH9MeQpeiXT/jwYEJxXCRcJ2OCJOj+xGqQmvwo5Ubect0QDm0kwOFYJ0LCqGONUtc4tkUuYxmIgJ4Yhb5mwvo7LGC4ypxhxRimmUkE4Pa7wL03YR2k9l+Y= cache: directories: - - build-cache + - build-cache script: -- docker build . --build-arg AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} --build-arg AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} - --build-arg REPO_URL=${REPO_URL} --build-arg REVISION=${TRAVIS_COMMIT} --build-arg - AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} + - docker build . + --build-arg AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} + --build-arg AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} + --build-arg REPO_URL=${REPO_URL} + --build-arg REVISION=${TRAVIS_COMMIT} + --build-arg AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} before_cache: -- docker-compose -f docker-compose.yml run --rm -v `pwd`/build-cache:/app/build-cache - ${SERVICE_NAME} bash docker-utils.sh save-cache + - docker run --rm -v `pwd`/build-cache:/app/build-cache ${SERVICE_NAME} bash docker-utils.sh save-cache From 775834836c297efe2cfd65e29bfe1eb43d9ce5f4 Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Wed, 28 Aug 2019 12:59:43 +0800 Subject: [PATCH 10/22] Added docker-utils.sh for caching --- .gitignore | 4 ++++ build-cache/.keep | 0 docker-utils.sh | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 build-cache/.keep create mode 100755 docker-utils.sh diff --git a/.gitignore b/.gitignore index b023787595..da1ac877dc 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,7 @@ test-output MANIFEST.MF work atlassian-ide-plugin.xml + +# Cached artifacts +/build-cache/* +!/build-cache/.keep diff --git a/build-cache/.keep b/build-cache/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docker-utils.sh b/docker-utils.sh new file mode 100755 index 0000000000..21593fad90 --- /dev/null +++ b/docker-utils.sh @@ -0,0 +1,37 @@ + #!/usr/bin/env bash + + set -e + + GRADLE_CACHE_ARCHIVE='build-cache/maven.tar.gz' + GRADLE_CACHE_DIR="/root/.m2/" + + function __load_cache { + if [ -f "$GRADLE_CACHE_ARCHIVE" ] + then + mkdir $GRADLE_CACHE_DIR + tar -xzf $GRADLE_CACHE_ARCHIVE -C $GRADLE_CACHE_DIR + echo "Extracted $GRADLE_CACHE_ARCHIVE to $GRADLE_CACHE_DIR" + else + echo "$GRADLE_CACHE_ARCHIVE not found" + fi + } + + function __save_cache { + # gzip without timestamps for consistent checksum + GZIP=-n tar -czf $GRADLE_CACHE_ARCHIVE --exclude='./daemon' --exclude='./native' --exclude='./notifications' -C $GRADLE_CACHE_DIR . + md5sum $GRADLE_CACHE_ARCHIVE + echo "Saved $GRADLE_CACHE_DIR to $GRADLE_CACHE_ARCHIVE" + } + + case "$1" in + load-cache) + __load_cache + ;; + save-cache) + __save_cache + ;; + *) + echo 'Unknown command' + exit 1 + esac + From 209dfaba8b8196257efc572a831620cd841b6af1 Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Wed, 28 Aug 2019 13:13:29 +0800 Subject: [PATCH 11/22] Specify docker imagename for the before_cache --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ecc9908e68..ce3d4301e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,8 @@ script: --build-arg REPO_URL=${REPO_URL} --build-arg REVISION=${TRAVIS_COMMIT} --build-arg AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} + -t wego/${SERVICE_NAME}:${TRAVIS_COMMIT} + - wego/${SERVICE_NAME}:latest before_cache: - - docker run --rm -v `pwd`/build-cache:/app/build-cache ${SERVICE_NAME} bash docker-utils.sh save-cache + - docker run --rm -v `pwd`/build-cache:/app/build-cache ${SERVICE_NAME}:${TRAVIS_COMMIT} bash docker-utils.sh save-cache From 92c4c5a35072c7960ca9fe67b984495200962f6e Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Wed, 28 Aug 2019 13:21:39 +0800 Subject: [PATCH 12/22] Fix typos --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce3d4301e2..7671fcf591 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ script: --build-arg REVISION=${TRAVIS_COMMIT} --build-arg AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} -t wego/${SERVICE_NAME}:${TRAVIS_COMMIT} - - wego/${SERVICE_NAME}:latest + -t wego/${SERVICE_NAME}:latest before_cache: - - docker run --rm -v `pwd`/build-cache:/app/build-cache ${SERVICE_NAME}:${TRAVIS_COMMIT} bash docker-utils.sh save-cache + - docker run --rm -v `pwd`/build-cache:/app/build-cache wego/${SERVICE_NAME}:${TRAVIS_COMMIT} bash docker-utils.sh save-cache From d2b52056bf936ddbf90cbaaecd2dd1f9c3af1440 Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Fri, 30 Aug 2019 10:18:15 +0800 Subject: [PATCH 13/22] Added docker-compose file and updated travis accordingly --- .travis.yml | 23 ++++++++++++++--------- Dockerfile | 19 +++++++++++-------- docker-compose.yml | 18 ++++++++++++++++++ 3 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 docker-compose.yml diff --git a/.travis.yml b/.travis.yml index 7671fcf591..f359b730b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ env: global: - SERVICE_NAME=asyc-http-client - AWS_DEFAULT_REGION=ap-southeast-1 + - REVISION=${TRAVIS_COMMIT} - secure: LkF6B+nBS6hUpb/E6uaXvKcai8Bw46sGJknfVj5W+0Q6ifhI+tDxRkh7Ug+VPmD+zberfJ1zczSBnCitS+POb3JhVBpuuXaec6WppAf6HamoJZHUU3EOAu22RjY60AMx9ACR4ZDvuSDq72Og2IGZHuDYd+Pp+fCb/4sKZfXG5PrYH1xaW1WhZYlq+G8J6KEjqObeZr2q77WyzJnwPmfSleuSiqBFsotQAgSYP+0BtZ2YlsqhdasHkcZWKlVH/PFGwItBgK5g63SLJaVBOoXx/Jm448N/ybubkmSXj1MHgMi4NsjS+IM5wD/tNQ/cAy0ilb94amQFIXy8La07bAqYV5Xzx2HOvUA+IkZKtGfXHR3RgtAUQb2U8B1J3tp06fk+CZAPiy8hk9GnKV5uV3g/QjC2FzzjzFSEIHLxEzHPTHlgXfIasMowAwr+E2iZUweP0EVYfY7D9lUcc5yNg8TnkTt5NgSaCnKsYsI5JfjzBNUBfcZzsgC8Z5yiC0ZVLiLFzt/WUaBnvzuzFq9vq/A8YwyZ8/ktqcRSc4+C09sfLZxSz9+HjA7ZY2C3GTjOgw3ApIGCCLXNiKLdn878Dl0cA1wNeAojfodtniEeMnrDs9i9jME7P6nkB+f4WnHzG8RBsAZZwkVGxkQeIsNP5a/ABAP/YLGPDVDpV2HI/cLUQro= - secure: l2qENS1Eoc7Y9cYUlN/HUZgAnsz3qizA2xh+H4OUdMlXYbf+deS9bCUWEJB/6FDhAEx25SeJWTvf90e6E7B18mktS6BoH+tAbxF/JP8NN+MxGfGRDtOiP9GdWrwy0RzFpGZldOizfy6GNEFxi1wtE95Dm4XIsJu17IRdt6AS9bJZ3Vm3fRifJrS/c6OmeWRGHXx1ftlBClVDgb987+u8I7PJ9WQ+rgKjJvZ4PaBRxAZVKnHN0olU/OJr/zSdtygXUN4q7b9kPpf7Uc4ZFWj3K7Fh0kfEdxZILBz/B6Zr//Ht7KWQAQ61yH+NO2VHCHD5/nGfk4cQ7PuE4SdoUlq/Jf8NheY/eXujFoakrxo2UtYOl+kRk0Z7s+1XryekLrEkEF3gvovSYAB1Ln1NR/0ccLbOXtNFMwDomNkiHKcx5txWZGohLhL9yn1hhOtHwBZ7+8qUe5WsuCSpgoJ5cU3JGeW/o/F3bBoLT5m3Ff4y889cWLHoW0nCgbyp0FXulNy4IOR0j2JTuihI8H2/ZnDEQpVV7HFlSR7mgJq23e0lSEMZXvbRo2+iLR766uM7GPyYKpGHJ3nEW5wMaWQocyvPThMxu8XVqGk+q56MOA8G7gSMkSWIzqJwHLmm+YEdJgklWj9epX3V2rUXjtSP4L5jvKu8IKZ9qLaHeu+fbDIxvRs= - secure: XrNa9rZ8SRsF+BmNMNyPThLwq9MzfIAK5C3zSGNxF4LBXpCet8xS1zfS/WUjhVIQnvRdgJvgcbZSswkj8lyZpI9WcCTyYH+eMdZf6kmyg2Adkygh3y23aN5/2EuAbsPckSc+U9EWjymEDEcbuIlDZ/+bhSpgo2J1UBwXuiY4TP9LyEPWrSP3DxCf3Bu1VyLnbvaQEy6xC4m1akutyCnBfkAWwQUbf7AQhXvLtkdNuw48mltcw2Itl3qgvA1dMXE06qGg68lNX3u2Bvwo7v8sylHrW2J+FbOOg7tT4Ru9SXFE9v37Lq45Y1tP1TXTjRyiOEeuUajBw85XU1a/xisdXZwGaXeqf50f3R/KPQj8oeBgCoA4xgy3YRTTx1QB0Aj/9I5cA7IY9Ld4R1RYM4jNni2vUZANOEqIqC8Gwh1EOoqfcQcTewnVRm/2gGnMg+dsSpX6REmUpqx4ivOrI1CGUasEg46+4y+LcKPBQI56EvxEKZ1YaXRqzd6kBGsDxriqlvz8pGbpds9skcIuB3W54jDweHv88XkSZD8fdUkMJyHdatQYxchujqH9MeQpeiXT/jwYEJxXCRcJ2OCJOj+xGqQmvwo5Ubect0QDm0kwOFYJ0LCqGONUtc4tkUuYxmIgJ4Yhb5mwvo7LGC4ypxhxRimmUkE4Pa7wL03YR2k9l+Y= @@ -16,15 +17,19 @@ cache: directories: - build-cache +install: + - docker-compose -f docker-compose.yml build + +before_script: + - docker-compose -f docker-compose.yml up -d + - sleep 20 + script: - - docker build . - --build-arg AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} - --build-arg AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} - --build-arg REPO_URL=${REPO_URL} - --build-arg REVISION=${TRAVIS_COMMIT} - --build-arg AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} - -t wego/${SERVICE_NAME}:${TRAVIS_COMMIT} - -t wego/${SERVICE_NAME}:latest + - docker inspect --format "{{json .State.ExitCode }}" $(docker-compose ps -q ${SERVICE_NAME}) | { read status; test $status = "0"; } before_cache: - - docker run --rm -v `pwd`/build-cache:/app/build-cache wego/${SERVICE_NAME}:${TRAVIS_COMMIT} bash docker-utils.sh save-cache + - docker-compose -f docker-compose.yml run --rm -v `pwd`/build-cache:/app/build-cache ${SERVICE_NAME} bash docker-utils.sh save-cache + +after_script: + - docker stats --no-stream + - docker-compose logs ${SERVICE_NAME} diff --git a/Dockerfile b/Dockerfile index 025c557ca3..a930f1316d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,30 +5,33 @@ FROM maven:3.6-jdk-11-slim RUN apt-get -qq update && \ apt-get -qq install -y --no-install-recommends \ build-essential \ - git \ openssh-client \ - locales \ - wget \ && rm -rf /var/lib/apt/lists/* # Read repo args -ARG REVISION +ARG VERSION ARG AWS_DEFAULT_REGION ARG AWS_ACCESS_KEY_ID ARG AWS_SECRET_ACCESS_KEY -ARG AWS_SESSION_TOKEN ARG REPO_URL ENV AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} ENV AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} -ENV AWS_SESSION_TOKEN=${AWS_SESSION_TOKEN} WORKDIR /app COPY . . -RUN mvn deploy -U \ +RUN mvn compile -U \ -Dmaven.test.skip=true \ -Dgpg.skip \ -DdistMgmtReleasesUrl=${REPO_URL}/releases \ -DdistMgmtSnapshotsUrl=${REPO_URL}/snapshots \ -DAWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \ - -Dproject.version=${REVISION} + -Dproject.version=${VERSION} + +CMD mvn deploy -U \ + -Dmaven.test.skip=true \ + -Dgpg.skip \ + -DdistMgmtReleasesUrl=${REPO_URL}/releases \ + -DdistMgmtSnapshotsUrl=${REPO_URL}/snapshots \ + -DAWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \ + -Dproject.version=${VERSION} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000000..b650836551 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,18 @@ +version: "3.7" +services: + async-http-client: + build: + context: . + args: + REPO_URL: ${REPO_URL} + AWS_DEFAULT_REGION: ap-southeast-1 + AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:?AWS_ACCESS_KEY_ID} + AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY:?AWS_SECRET_ACCESS_KEY} + VERSION: ${REVISION:-TRAVIS_COMMIT} + image: wego/async-http-client + environment: + AWS_DEFAULT_REGION: ap-southeast-1 + AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:?AWS_ACCESS_KEY_ID} + AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY:?AWS_SECRET_ACCESS_KEY} + REPO_URL: ${REPO_URL} + VERSION: ${REVISION:-TRAVIS_COMMIT} From 87dbe3ed340582fb50caf1ff71490dacee2200f6 Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Fri, 30 Aug 2019 10:39:31 +0800 Subject: [PATCH 14/22] Fixed wrong service name in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f359b730b5..9ea1fee51a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ services: env: global: - - SERVICE_NAME=asyc-http-client + - SERVICE_NAME=async-http-client - AWS_DEFAULT_REGION=ap-southeast-1 - REVISION=${TRAVIS_COMMIT} - secure: LkF6B+nBS6hUpb/E6uaXvKcai8Bw46sGJknfVj5W+0Q6ifhI+tDxRkh7Ug+VPmD+zberfJ1zczSBnCitS+POb3JhVBpuuXaec6WppAf6HamoJZHUU3EOAu22RjY60AMx9ACR4ZDvuSDq72Og2IGZHuDYd+Pp+fCb/4sKZfXG5PrYH1xaW1WhZYlq+G8J6KEjqObeZr2q77WyzJnwPmfSleuSiqBFsotQAgSYP+0BtZ2YlsqhdasHkcZWKlVH/PFGwItBgK5g63SLJaVBOoXx/Jm448N/ybubkmSXj1MHgMi4NsjS+IM5wD/tNQ/cAy0ilb94amQFIXy8La07bAqYV5Xzx2HOvUA+IkZKtGfXHR3RgtAUQb2U8B1J3tp06fk+CZAPiy8hk9GnKV5uV3g/QjC2FzzjzFSEIHLxEzHPTHlgXfIasMowAwr+E2iZUweP0EVYfY7D9lUcc5yNg8TnkTt5NgSaCnKsYsI5JfjzBNUBfcZzsgC8Z5yiC0ZVLiLFzt/WUaBnvzuzFq9vq/A8YwyZ8/ktqcRSc4+C09sfLZxSz9+HjA7ZY2C3GTjOgw3ApIGCCLXNiKLdn878Dl0cA1wNeAojfodtniEeMnrDs9i9jME7P6nkB+f4WnHzG8RBsAZZwkVGxkQeIsNP5a/ABAP/YLGPDVDpV2HI/cLUQro= From 0129913430ec9e5cb88263d1c2596bf9ccea0cf1 Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Tue, 3 Sep 2019 10:43:11 +0800 Subject: [PATCH 15/22] - Improved travis file - Updated credentials --- .travis.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ea1fee51a..691d1e7986 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,9 @@ env: - SERVICE_NAME=async-http-client - AWS_DEFAULT_REGION=ap-southeast-1 - REVISION=${TRAVIS_COMMIT} - - secure: LkF6B+nBS6hUpb/E6uaXvKcai8Bw46sGJknfVj5W+0Q6ifhI+tDxRkh7Ug+VPmD+zberfJ1zczSBnCitS+POb3JhVBpuuXaec6WppAf6HamoJZHUU3EOAu22RjY60AMx9ACR4ZDvuSDq72Og2IGZHuDYd+Pp+fCb/4sKZfXG5PrYH1xaW1WhZYlq+G8J6KEjqObeZr2q77WyzJnwPmfSleuSiqBFsotQAgSYP+0BtZ2YlsqhdasHkcZWKlVH/PFGwItBgK5g63SLJaVBOoXx/Jm448N/ybubkmSXj1MHgMi4NsjS+IM5wD/tNQ/cAy0ilb94amQFIXy8La07bAqYV5Xzx2HOvUA+IkZKtGfXHR3RgtAUQb2U8B1J3tp06fk+CZAPiy8hk9GnKV5uV3g/QjC2FzzjzFSEIHLxEzHPTHlgXfIasMowAwr+E2iZUweP0EVYfY7D9lUcc5yNg8TnkTt5NgSaCnKsYsI5JfjzBNUBfcZzsgC8Z5yiC0ZVLiLFzt/WUaBnvzuzFq9vq/A8YwyZ8/ktqcRSc4+C09sfLZxSz9+HjA7ZY2C3GTjOgw3ApIGCCLXNiKLdn878Dl0cA1wNeAojfodtniEeMnrDs9i9jME7P6nkB+f4WnHzG8RBsAZZwkVGxkQeIsNP5a/ABAP/YLGPDVDpV2HI/cLUQro= - - secure: l2qENS1Eoc7Y9cYUlN/HUZgAnsz3qizA2xh+H4OUdMlXYbf+deS9bCUWEJB/6FDhAEx25SeJWTvf90e6E7B18mktS6BoH+tAbxF/JP8NN+MxGfGRDtOiP9GdWrwy0RzFpGZldOizfy6GNEFxi1wtE95Dm4XIsJu17IRdt6AS9bJZ3Vm3fRifJrS/c6OmeWRGHXx1ftlBClVDgb987+u8I7PJ9WQ+rgKjJvZ4PaBRxAZVKnHN0olU/OJr/zSdtygXUN4q7b9kPpf7Uc4ZFWj3K7Fh0kfEdxZILBz/B6Zr//Ht7KWQAQ61yH+NO2VHCHD5/nGfk4cQ7PuE4SdoUlq/Jf8NheY/eXujFoakrxo2UtYOl+kRk0Z7s+1XryekLrEkEF3gvovSYAB1Ln1NR/0ccLbOXtNFMwDomNkiHKcx5txWZGohLhL9yn1hhOtHwBZ7+8qUe5WsuCSpgoJ5cU3JGeW/o/F3bBoLT5m3Ff4y889cWLHoW0nCgbyp0FXulNy4IOR0j2JTuihI8H2/ZnDEQpVV7HFlSR7mgJq23e0lSEMZXvbRo2+iLR766uM7GPyYKpGHJ3nEW5wMaWQocyvPThMxu8XVqGk+q56MOA8G7gSMkSWIzqJwHLmm+YEdJgklWj9epX3V2rUXjtSP4L5jvKu8IKZ9qLaHeu+fbDIxvRs= - - secure: XrNa9rZ8SRsF+BmNMNyPThLwq9MzfIAK5C3zSGNxF4LBXpCet8xS1zfS/WUjhVIQnvRdgJvgcbZSswkj8lyZpI9WcCTyYH+eMdZf6kmyg2Adkygh3y23aN5/2EuAbsPckSc+U9EWjymEDEcbuIlDZ/+bhSpgo2J1UBwXuiY4TP9LyEPWrSP3DxCf3Bu1VyLnbvaQEy6xC4m1akutyCnBfkAWwQUbf7AQhXvLtkdNuw48mltcw2Itl3qgvA1dMXE06qGg68lNX3u2Bvwo7v8sylHrW2J+FbOOg7tT4Ru9SXFE9v37Lq45Y1tP1TXTjRyiOEeuUajBw85XU1a/xisdXZwGaXeqf50f3R/KPQj8oeBgCoA4xgy3YRTTx1QB0Aj/9I5cA7IY9Ld4R1RYM4jNni2vUZANOEqIqC8Gwh1EOoqfcQcTewnVRm/2gGnMg+dsSpX6REmUpqx4ivOrI1CGUasEg46+4y+LcKPBQI56EvxEKZ1YaXRqzd6kBGsDxriqlvz8pGbpds9skcIuB3W54jDweHv88XkSZD8fdUkMJyHdatQYxchujqH9MeQpeiXT/jwYEJxXCRcJ2OCJOj+xGqQmvwo5Ubect0QDm0kwOFYJ0LCqGONUtc4tkUuYxmIgJ4Yhb5mwvo7LGC4ypxhxRimmUkE4Pa7wL03YR2k9l+Y= + - secure: vto8UyM7tMHE4tUwxmYC150orDzrz/6b33m8V6+yh1uHWJmtqhyshsjLKFMmiqkAHz/7jmrgMMlHcnYJ27IyNJsqd4WNQfUjf9nRuizbRKD+yhy7R+IKbgy8bSYizyvQ/4T07sJkOcebzXJigTlOjxpwDfKgBj7vqr5paXrir0Srs0jjgyMxnASFYaBvy2i6wPyPqslkbwHwTapWg3porl/EmSj9rmgHVnPED5CPYraMp+zTHJCpP6xgGn1N3wS+x3sUDZ4MSHeZLXbaSzmIIUBNbYSUjOnEspD0Pi/78G1cl6sW7KiSIAt+H6hoy1+rU6J4RyB8M6pSvNJDlgnYfemG/6onTAXA5n/0+dcs1X2skA3GscOmPoEUuPYyKeQwk2eXK67UC7LNSu1HSAeIxPgwKv4axmFPv/2GJtM70HP28cR35gzyWMMhsxGT7tuKE7W83bEuT/nUzXCWCC80LCOpRRHvfxczUO7bFDE9Be4K/xKtIAJiHZimcvixRoxRojPVSr8DrmeSFA+oGgE6F0hW6cQDynqF7FlmIb+6h3DVPWegQZqi7RP3UHy2qSwj2gAYAydd6FHib7juc8K4xIDdgZ53reCmQL6ULEwKF2unWDxLZ3urqDmhIc3qRH6it9VWdKoNr25EDgKXMVfiGoeKeZBVAl0KtdD6kDgLE9Q= + - secure: mLmKxZKFaaa98pVHMMcF/XEoXIebrOX7B9ZSLdGeB/2N9PWQnTRRThLrbd2gY1mpxPW+Nu6Nn4M0eh0g0kfYpypaetq7RO8GtNgRDW7qNDTr3q+dcV0+xW2YC+sAhvOnTMu8uz0bHf1y6iQMMvjggU9pyBD9iGtcANn5WXg+UW9cnlvx44MIzpKXt9RzItNpRgTC2/z+j8QL5zjwpMB2xT6EuP7ZFj1xnCQTAZ04qdOmM9Ro7rpvw0zYUIsYuEiyZMIgaGAsaGr00+VpbM9yRQTx7gGjvU6DLs3NfjJrl9ZyaR/vofAGjeV8DBNWBJwL6faq3y091joLIsWv4+tDfh+SZVwbUUhhHZUS0tuqebC0XAQMR5SAfOcO7t7blu9zk3esaeGYWaahQ3Jy1XupvuRQRu9Uj2p5tQTNRrDN9/8l4a9lwdhruDeHUeAwT1UGyx68WhXppWHuHw/Gbt20mo6nspuFPVJ5JrqdYrcfL4dUs+XY2sg4esweivOfrUy7F0noA85/Ol14P2wHyVp4aO+Bc8R+g87MxVlPm+vyW2YJQOi9EYFnPc6YyCu/RbXjvGh6y8izAN6BojeRJ9OJZjRZCG2s9CgL7a75ZOJEQ/ADpnJyhjD6XPlq7ZLwrh0j9fKLTYpk/zh26Ws/ZtGi0sMlwIXotGzVrIQUGgOmS00= + - secure: DPh5/VR6H3TSzReXgN6HVUoS7nvBX6nchs4esS0jLc/H34wAhC87d8g/8rn7GOvlf/jfr3ujUdl9EFGEy5WjfhNJYDqD/lLz2FmeNh8mI5ZX6mAhmd1CI7ow3miT/Dj/jdY/felWjgWRQIZRaYAv+qwoT96JSSEIO4lpfzafp4lXeD9oKp5t2Uk+Afz41x+e/OCoOW1VtUZi9VEiKbxcQCrwZRuHptTveJCi86zPeIokuUT+BBs0qQur960bq0c+XpkOC6tg3SLIQJJ/OSariiGfuap/A8ZObn9YFprmUYUUV9X8sOPuCBMOMQkqeG9DxNGEloHa9Xi+QpLTfFuLPvyp+PhZVYlMLvsH2GeWLNimlBqENaeKt/2DcO6pwf5TB0JcpV5tEPcjI3QVuqUEk6oXpwwAdoff4bN6Uafo3vKyQXEAsr26b590kxAhKxpI7nPmYtvHSkCfVxLh5Q2R6C0dpaGdamBRKjD+Lku2PJXE+lErk5SnK2BgBkiuuBaxVvUYO9RatucVVne+VDTJY6brcXJEEDs/myfK6lpF2cb5BM14l58iHWBQHmiDhGyl3CKRVXpavG9IuuVMf7siV0957ixCZstlU7J4RDwunGrl6RM3BQdj55atnHu+AKuy3piVy+NX+IimiaRsWw+N04pO3sAakG0fMa1YQ55RDOQ= cache: directories: @@ -21,15 +21,11 @@ install: - docker-compose -f docker-compose.yml build before_script: - - docker-compose -f docker-compose.yml up -d - - sleep 20 + - docker-compose -f docker-compose.yml run ${SERVICE_NAME} script: - - docker inspect --format "{{json .State.ExitCode }}" $(docker-compose ps -q ${SERVICE_NAME}) | { read status; test $status = "0"; } + - docker inspect --format "{{json .State.ExitCode }}" $(docker-compose ps -q ${SERVICE_NAME}) before_cache: - - docker-compose -f docker-compose.yml run --rm -v `pwd`/build-cache:/app/build-cache ${SERVICE_NAME} bash docker-utils.sh save-cache - -after_script: - - docker stats --no-stream - - docker-compose logs ${SERVICE_NAME} + - docker-compose -f docker-compose.yml run --rm -v `pwd`/build-cache:/app/build-cache + ${SERVICE_NAME} bash docker-utils.sh save-cache From f5b42ef3c76d7a4cf590fbac8950ca5f75e2142e Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Tue, 3 Sep 2019 11:50:00 +0800 Subject: [PATCH 16/22] docker inspect update in travis --- .travis.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 691d1e7986..77cccffa77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ before_script: - docker-compose -f docker-compose.yml run ${SERVICE_NAME} script: - - docker inspect --format "{{json .State.ExitCode }}" $(docker-compose ps -q ${SERVICE_NAME}) + - docker inspect --format "{{json .State.ExitCode }}" $(docker-compose ps -a -q ${SERVICE_NAME}) before_cache: - docker-compose -f docker-compose.yml run --rm -v `pwd`/build-cache:/app/build-cache diff --git a/Dockerfile b/Dockerfile index a930f1316d..e7351b8bdb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,4 +34,4 @@ CMD mvn deploy -U \ -DdistMgmtReleasesUrl=${REPO_URL}/releases \ -DdistMgmtSnapshotsUrl=${REPO_URL}/snapshots \ -DAWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \ - -Dproject.version=${VERSION} \ No newline at end of file + -Dproject.version=${VERSION} From a96ad1f2ff3d9700d157d2b5e96bb90913c1cfb0 Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Tue, 3 Sep 2019 11:57:30 +0800 Subject: [PATCH 17/22] Removed travis after_script --- .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 77cccffa77..05b2d8d3e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,12 +20,8 @@ cache: install: - docker-compose -f docker-compose.yml build -before_script: - - docker-compose -f docker-compose.yml run ${SERVICE_NAME} - script: - - docker inspect --format "{{json .State.ExitCode }}" $(docker-compose ps -a -q ${SERVICE_NAME}) + - docker-compose -f docker-compose.yml run ${SERVICE_NAME} before_cache: - - docker-compose -f docker-compose.yml run --rm -v `pwd`/build-cache:/app/build-cache - ${SERVICE_NAME} bash docker-utils.sh save-cache + - docker-compose -f docker-compose.yml run --rm -v `pwd`/build-cache:/app/build-cache ${SERVICE_NAME} bash docker-utils.sh save-cache From b246b92a65cc2e0ae20a2a3be7bde7d90be08b6e Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Tue, 3 Sep 2019 17:18:29 +0800 Subject: [PATCH 18/22] Shorten revision --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 05b2d8d3e0..6533856fb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ env: global: - SERVICE_NAME=async-http-client - AWS_DEFAULT_REGION=ap-southeast-1 - - REVISION=${TRAVIS_COMMIT} + - REVISION=$(git rev-parse --short ${TRAVIS_COMMIT}) - secure: vto8UyM7tMHE4tUwxmYC150orDzrz/6b33m8V6+yh1uHWJmtqhyshsjLKFMmiqkAHz/7jmrgMMlHcnYJ27IyNJsqd4WNQfUjf9nRuizbRKD+yhy7R+IKbgy8bSYizyvQ/4T07sJkOcebzXJigTlOjxpwDfKgBj7vqr5paXrir0Srs0jjgyMxnASFYaBvy2i6wPyPqslkbwHwTapWg3porl/EmSj9rmgHVnPED5CPYraMp+zTHJCpP6xgGn1N3wS+x3sUDZ4MSHeZLXbaSzmIIUBNbYSUjOnEspD0Pi/78G1cl6sW7KiSIAt+H6hoy1+rU6J4RyB8M6pSvNJDlgnYfemG/6onTAXA5n/0+dcs1X2skA3GscOmPoEUuPYyKeQwk2eXK67UC7LNSu1HSAeIxPgwKv4axmFPv/2GJtM70HP28cR35gzyWMMhsxGT7tuKE7W83bEuT/nUzXCWCC80LCOpRRHvfxczUO7bFDE9Be4K/xKtIAJiHZimcvixRoxRojPVSr8DrmeSFA+oGgE6F0hW6cQDynqF7FlmIb+6h3DVPWegQZqi7RP3UHy2qSwj2gAYAydd6FHib7juc8K4xIDdgZ53reCmQL6ULEwKF2unWDxLZ3urqDmhIc3qRH6it9VWdKoNr25EDgKXMVfiGoeKeZBVAl0KtdD6kDgLE9Q= - secure: mLmKxZKFaaa98pVHMMcF/XEoXIebrOX7B9ZSLdGeB/2N9PWQnTRRThLrbd2gY1mpxPW+Nu6Nn4M0eh0g0kfYpypaetq7RO8GtNgRDW7qNDTr3q+dcV0+xW2YC+sAhvOnTMu8uz0bHf1y6iQMMvjggU9pyBD9iGtcANn5WXg+UW9cnlvx44MIzpKXt9RzItNpRgTC2/z+j8QL5zjwpMB2xT6EuP7ZFj1xnCQTAZ04qdOmM9Ro7rpvw0zYUIsYuEiyZMIgaGAsaGr00+VpbM9yRQTx7gGjvU6DLs3NfjJrl9ZyaR/vofAGjeV8DBNWBJwL6faq3y091joLIsWv4+tDfh+SZVwbUUhhHZUS0tuqebC0XAQMR5SAfOcO7t7blu9zk3esaeGYWaahQ3Jy1XupvuRQRu9Uj2p5tQTNRrDN9/8l4a9lwdhruDeHUeAwT1UGyx68WhXppWHuHw/Gbt20mo6nspuFPVJ5JrqdYrcfL4dUs+XY2sg4esweivOfrUy7F0noA85/Ol14P2wHyVp4aO+Bc8R+g87MxVlPm+vyW2YJQOi9EYFnPc6YyCu/RbXjvGh6y8izAN6BojeRJ9OJZjRZCG2s9CgL7a75ZOJEQ/ADpnJyhjD6XPlq7ZLwrh0j9fKLTYpk/zh26Ws/ZtGi0sMlwIXotGzVrIQUGgOmS00= - secure: DPh5/VR6H3TSzReXgN6HVUoS7nvBX6nchs4esS0jLc/H34wAhC87d8g/8rn7GOvlf/jfr3ujUdl9EFGEy5WjfhNJYDqD/lLz2FmeNh8mI5ZX6mAhmd1CI7ow3miT/Dj/jdY/felWjgWRQIZRaYAv+qwoT96JSSEIO4lpfzafp4lXeD9oKp5t2Uk+Afz41x+e/OCoOW1VtUZi9VEiKbxcQCrwZRuHptTveJCi86zPeIokuUT+BBs0qQur960bq0c+XpkOC6tg3SLIQJJ/OSariiGfuap/A8ZObn9YFprmUYUUV9X8sOPuCBMOMQkqeG9DxNGEloHa9Xi+QpLTfFuLPvyp+PhZVYlMLvsH2GeWLNimlBqENaeKt/2DcO6pwf5TB0JcpV5tEPcjI3QVuqUEk6oXpwwAdoff4bN6Uafo3vKyQXEAsr26b590kxAhKxpI7nPmYtvHSkCfVxLh5Q2R6C0dpaGdamBRKjD+Lku2PJXE+lErk5SnK2BgBkiuuBaxVvUYO9RatucVVne+VDTJY6brcXJEEDs/myfK6lpF2cb5BM14l58iHWBQHmiDhGyl3CKRVXpavG9IuuVMf7siV0957ixCZstlU7J4RDwunGrl6RM3BQdj55atnHu+AKuy3piVy+NX+IimiaRsWw+N04pO3sAakG0fMa1YQ55RDOQ= From 2b618057488e84aca40eed28c49d60f0853256bf Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Thu, 5 Sep 2019 11:22:00 +0800 Subject: [PATCH 19/22] Got rid of duplicate args and env vars --- Dockerfile | 3 +++ docker-compose.yml | 11 +++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index e7351b8bdb..2949c4f889 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,9 @@ ARG AWS_DEFAULT_REGION ARG AWS_ACCESS_KEY_ID ARG AWS_SECRET_ACCESS_KEY ARG REPO_URL +ENV REPO_URL=${REPO_URL} +ENV VERSION=${VERSION} +ENV AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} ENV AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} ENV AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} diff --git a/docker-compose.yml b/docker-compose.yml index b650836551..28e685e459 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,15 +4,10 @@ services: build: context: . args: - REPO_URL: ${REPO_URL} - AWS_DEFAULT_REGION: ap-southeast-1 - AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:?AWS_ACCESS_KEY_ID} - AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY:?AWS_SECRET_ACCESS_KEY} - VERSION: ${REVISION:-TRAVIS_COMMIT} + REPO_URL: ${REPO_URL:?REPO_URL} + AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION:?AWS_DEFAULT_REGION} + VERSION: ${REVISION:?REVISION} image: wego/async-http-client environment: - AWS_DEFAULT_REGION: ap-southeast-1 AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:?AWS_ACCESS_KEY_ID} AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY:?AWS_SECRET_ACCESS_KEY} - REPO_URL: ${REPO_URL} - VERSION: ${REVISION:-TRAVIS_COMMIT} From acb3b23238d48ef50133b67aff54a25a4b6d88ac Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Fri, 6 Sep 2019 10:41:09 +0800 Subject: [PATCH 20/22] Removed unused args from dockerfile --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2949c4f889..659bac37e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,6 @@ RUN apt-get -qq update && \ # Read repo args ARG VERSION ARG AWS_DEFAULT_REGION -ARG AWS_ACCESS_KEY_ID -ARG AWS_SECRET_ACCESS_KEY ARG REPO_URL ENV REPO_URL=${REPO_URL} ENV VERSION=${VERSION} From 64c9a188a7ad57045438cd5407c546a2407f1566 Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Wed, 11 Sep 2019 11:38:17 +0800 Subject: [PATCH 21/22] Removed unwanted build args from dockerfile --- .travis.yml | 2 +- Dockerfile | 9 --------- docker-compose.yml | 4 ++-- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6533856fb8..6af9ef6148 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,11 @@ services: env: global: - SERVICE_NAME=async-http-client - - AWS_DEFAULT_REGION=ap-southeast-1 - REVISION=$(git rev-parse --short ${TRAVIS_COMMIT}) - secure: vto8UyM7tMHE4tUwxmYC150orDzrz/6b33m8V6+yh1uHWJmtqhyshsjLKFMmiqkAHz/7jmrgMMlHcnYJ27IyNJsqd4WNQfUjf9nRuizbRKD+yhy7R+IKbgy8bSYizyvQ/4T07sJkOcebzXJigTlOjxpwDfKgBj7vqr5paXrir0Srs0jjgyMxnASFYaBvy2i6wPyPqslkbwHwTapWg3porl/EmSj9rmgHVnPED5CPYraMp+zTHJCpP6xgGn1N3wS+x3sUDZ4MSHeZLXbaSzmIIUBNbYSUjOnEspD0Pi/78G1cl6sW7KiSIAt+H6hoy1+rU6J4RyB8M6pSvNJDlgnYfemG/6onTAXA5n/0+dcs1X2skA3GscOmPoEUuPYyKeQwk2eXK67UC7LNSu1HSAeIxPgwKv4axmFPv/2GJtM70HP28cR35gzyWMMhsxGT7tuKE7W83bEuT/nUzXCWCC80LCOpRRHvfxczUO7bFDE9Be4K/xKtIAJiHZimcvixRoxRojPVSr8DrmeSFA+oGgE6F0hW6cQDynqF7FlmIb+6h3DVPWegQZqi7RP3UHy2qSwj2gAYAydd6FHib7juc8K4xIDdgZ53reCmQL6ULEwKF2unWDxLZ3urqDmhIc3qRH6it9VWdKoNr25EDgKXMVfiGoeKeZBVAl0KtdD6kDgLE9Q= - secure: mLmKxZKFaaa98pVHMMcF/XEoXIebrOX7B9ZSLdGeB/2N9PWQnTRRThLrbd2gY1mpxPW+Nu6Nn4M0eh0g0kfYpypaetq7RO8GtNgRDW7qNDTr3q+dcV0+xW2YC+sAhvOnTMu8uz0bHf1y6iQMMvjggU9pyBD9iGtcANn5WXg+UW9cnlvx44MIzpKXt9RzItNpRgTC2/z+j8QL5zjwpMB2xT6EuP7ZFj1xnCQTAZ04qdOmM9Ro7rpvw0zYUIsYuEiyZMIgaGAsaGr00+VpbM9yRQTx7gGjvU6DLs3NfjJrl9ZyaR/vofAGjeV8DBNWBJwL6faq3y091joLIsWv4+tDfh+SZVwbUUhhHZUS0tuqebC0XAQMR5SAfOcO7t7blu9zk3esaeGYWaahQ3Jy1XupvuRQRu9Uj2p5tQTNRrDN9/8l4a9lwdhruDeHUeAwT1UGyx68WhXppWHuHw/Gbt20mo6nspuFPVJ5JrqdYrcfL4dUs+XY2sg4esweivOfrUy7F0noA85/Ol14P2wHyVp4aO+Bc8R+g87MxVlPm+vyW2YJQOi9EYFnPc6YyCu/RbXjvGh6y8izAN6BojeRJ9OJZjRZCG2s9CgL7a75ZOJEQ/ADpnJyhjD6XPlq7ZLwrh0j9fKLTYpk/zh26Ws/ZtGi0sMlwIXotGzVrIQUGgOmS00= - secure: DPh5/VR6H3TSzReXgN6HVUoS7nvBX6nchs4esS0jLc/H34wAhC87d8g/8rn7GOvlf/jfr3ujUdl9EFGEy5WjfhNJYDqD/lLz2FmeNh8mI5ZX6mAhmd1CI7ow3miT/Dj/jdY/felWjgWRQIZRaYAv+qwoT96JSSEIO4lpfzafp4lXeD9oKp5t2Uk+Afz41x+e/OCoOW1VtUZi9VEiKbxcQCrwZRuHptTveJCi86zPeIokuUT+BBs0qQur960bq0c+XpkOC6tg3SLIQJJ/OSariiGfuap/A8ZObn9YFprmUYUUV9X8sOPuCBMOMQkqeG9DxNGEloHa9Xi+QpLTfFuLPvyp+PhZVYlMLvsH2GeWLNimlBqENaeKt/2DcO6pwf5TB0JcpV5tEPcjI3QVuqUEk6oXpwwAdoff4bN6Uafo3vKyQXEAsr26b590kxAhKxpI7nPmYtvHSkCfVxLh5Q2R6C0dpaGdamBRKjD+Lku2PJXE+lErk5SnK2BgBkiuuBaxVvUYO9RatucVVne+VDTJY6brcXJEEDs/myfK6lpF2cb5BM14l58iHWBQHmiDhGyl3CKRVXpavG9IuuVMf7siV0957ixCZstlU7J4RDwunGrl6RM3BQdj55atnHu+AKuy3piVy+NX+IimiaRsWw+N04pO3sAakG0fMa1YQ55RDOQ= + - secure: eZclfJ0N5XzH4Y8ZzLrbcX6iv9Mgc4gctU//jNTN39U2qlBvSUiuY3GDwZfPZjC/V0aeS1+Kb/NBeHaOTfEcqd3+nn4lYrEz3Aqi3NJoapgcWtcQDwIs9edRoJLxZ2iRJJqMY0ONTDur5qgAw+21Pk1KCHFMYVwHcXuOqf5fGTxhi0m1qSEHXJUNnVHP9mAwcF9YvmePeBi/s9RU/E6vHjjg7ZH//JTnGYERn9EqygXwFP+BKx+HrI+8mzmgOiZvwJkUrA6Yk6Z0QIcMiBfIVKm8AdQr4lo8UtZcm1YWz4z0wnN24UxKf3PwKy9Br9Ol2T4nLlAfRYBmNF6HM/nsC+TENfelZvp8xkH79hsdSfCNoWS5Ir1LgvKGJ/Nr/msM80bvBOqsqeT3MaInuWVRfAVhYlFhqUHuVSQf74qbSYXCyMnUR5GYZ6ZY/aYcXw1bFDmBLBRroMw4E76NLsmqoAU8Cq9PaZIqsGGt5fqv5tJMEPaAWr0tNwywtVVoLV3wZh15dClMRkfvrYEUuSBLw0neAHDVNz4UYvySfQgAtDIndxR9lwoBssMGi4zNVfFJ/kAFSTaWoiwu2Q7dp4LJIgG1ZHvUV1uICZhd9rPjEjS83FNCSAt1WBX7r8hLbBLhZBjl7dMl4CQqW4xC6JjzHjACiHGpjoyBBy9arrxg4PU= cache: directories: diff --git a/Dockerfile b/Dockerfile index 659bac37e7..e61a4faff6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,13 +10,7 @@ RUN apt-get -qq update && \ # Read repo args ARG VERSION -ARG AWS_DEFAULT_REGION -ARG REPO_URL -ENV REPO_URL=${REPO_URL} ENV VERSION=${VERSION} -ENV AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} -ENV AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} -ENV AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} WORKDIR /app COPY . . @@ -24,9 +18,6 @@ COPY . . RUN mvn compile -U \ -Dmaven.test.skip=true \ -Dgpg.skip \ - -DdistMgmtReleasesUrl=${REPO_URL}/releases \ - -DdistMgmtSnapshotsUrl=${REPO_URL}/snapshots \ - -DAWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \ -Dproject.version=${VERSION} CMD mvn deploy -U \ diff --git a/docker-compose.yml b/docker-compose.yml index 28e685e459..1153be957b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,10 +4,10 @@ services: build: context: . args: - REPO_URL: ${REPO_URL:?REPO_URL} - AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION:?AWS_DEFAULT_REGION} VERSION: ${REVISION:?REVISION} image: wego/async-http-client environment: AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:?AWS_ACCESS_KEY_ID} AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY:?AWS_SECRET_ACCESS_KEY} + AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION:?AWS_DEFAULT_REGION} + REPO_URL: ${REPO_URL:?REPO_URL} From 12d6df437969f4d27909e7633f67e24649d58106 Mon Sep 17 00:00:00 2001 From: Pubudu Perera Date: Wed, 11 Sep 2019 16:03:38 +0800 Subject: [PATCH 22/22] Temp hardcoding version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6af9ef6148..4f7e1fcd9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ services: env: global: - SERVICE_NAME=async-http-client - - REVISION=$(git rev-parse --short ${TRAVIS_COMMIT}) + - REVISION=2.5.3-SNAPSHOT - secure: vto8UyM7tMHE4tUwxmYC150orDzrz/6b33m8V6+yh1uHWJmtqhyshsjLKFMmiqkAHz/7jmrgMMlHcnYJ27IyNJsqd4WNQfUjf9nRuizbRKD+yhy7R+IKbgy8bSYizyvQ/4T07sJkOcebzXJigTlOjxpwDfKgBj7vqr5paXrir0Srs0jjgyMxnASFYaBvy2i6wPyPqslkbwHwTapWg3porl/EmSj9rmgHVnPED5CPYraMp+zTHJCpP6xgGn1N3wS+x3sUDZ4MSHeZLXbaSzmIIUBNbYSUjOnEspD0Pi/78G1cl6sW7KiSIAt+H6hoy1+rU6J4RyB8M6pSvNJDlgnYfemG/6onTAXA5n/0+dcs1X2skA3GscOmPoEUuPYyKeQwk2eXK67UC7LNSu1HSAeIxPgwKv4axmFPv/2GJtM70HP28cR35gzyWMMhsxGT7tuKE7W83bEuT/nUzXCWCC80LCOpRRHvfxczUO7bFDE9Be4K/xKtIAJiHZimcvixRoxRojPVSr8DrmeSFA+oGgE6F0hW6cQDynqF7FlmIb+6h3DVPWegQZqi7RP3UHy2qSwj2gAYAydd6FHib7juc8K4xIDdgZ53reCmQL6ULEwKF2unWDxLZ3urqDmhIc3qRH6it9VWdKoNr25EDgKXMVfiGoeKeZBVAl0KtdD6kDgLE9Q= - secure: mLmKxZKFaaa98pVHMMcF/XEoXIebrOX7B9ZSLdGeB/2N9PWQnTRRThLrbd2gY1mpxPW+Nu6Nn4M0eh0g0kfYpypaetq7RO8GtNgRDW7qNDTr3q+dcV0+xW2YC+sAhvOnTMu8uz0bHf1y6iQMMvjggU9pyBD9iGtcANn5WXg+UW9cnlvx44MIzpKXt9RzItNpRgTC2/z+j8QL5zjwpMB2xT6EuP7ZFj1xnCQTAZ04qdOmM9Ro7rpvw0zYUIsYuEiyZMIgaGAsaGr00+VpbM9yRQTx7gGjvU6DLs3NfjJrl9ZyaR/vofAGjeV8DBNWBJwL6faq3y091joLIsWv4+tDfh+SZVwbUUhhHZUS0tuqebC0XAQMR5SAfOcO7t7blu9zk3esaeGYWaahQ3Jy1XupvuRQRu9Uj2p5tQTNRrDN9/8l4a9lwdhruDeHUeAwT1UGyx68WhXppWHuHw/Gbt20mo6nspuFPVJ5JrqdYrcfL4dUs+XY2sg4esweivOfrUy7F0noA85/Ol14P2wHyVp4aO+Bc8R+g87MxVlPm+vyW2YJQOi9EYFnPc6YyCu/RbXjvGh6y8izAN6BojeRJ9OJZjRZCG2s9CgL7a75ZOJEQ/ADpnJyhjD6XPlq7ZLwrh0j9fKLTYpk/zh26Ws/ZtGi0sMlwIXotGzVrIQUGgOmS00= - secure: DPh5/VR6H3TSzReXgN6HVUoS7nvBX6nchs4esS0jLc/H34wAhC87d8g/8rn7GOvlf/jfr3ujUdl9EFGEy5WjfhNJYDqD/lLz2FmeNh8mI5ZX6mAhmd1CI7ow3miT/Dj/jdY/felWjgWRQIZRaYAv+qwoT96JSSEIO4lpfzafp4lXeD9oKp5t2Uk+Afz41x+e/OCoOW1VtUZi9VEiKbxcQCrwZRuHptTveJCi86zPeIokuUT+BBs0qQur960bq0c+XpkOC6tg3SLIQJJ/OSariiGfuap/A8ZObn9YFprmUYUUV9X8sOPuCBMOMQkqeG9DxNGEloHa9Xi+QpLTfFuLPvyp+PhZVYlMLvsH2GeWLNimlBqENaeKt/2DcO6pwf5TB0JcpV5tEPcjI3QVuqUEk6oXpwwAdoff4bN6Uafo3vKyQXEAsr26b590kxAhKxpI7nPmYtvHSkCfVxLh5Q2R6C0dpaGdamBRKjD+Lku2PJXE+lErk5SnK2BgBkiuuBaxVvUYO9RatucVVne+VDTJY6brcXJEEDs/myfK6lpF2cb5BM14l58iHWBQHmiDhGyl3CKRVXpavG9IuuVMf7siV0957ixCZstlU7J4RDwunGrl6RM3BQdj55atnHu+AKuy3piVy+NX+IimiaRsWw+N04pO3sAakG0fMa1YQ55RDOQ=