From 420a5e9cbf6bc2c30a18c8dff8d8c2744f867518 Mon Sep 17 00:00:00 2001 From: MilenkoMarkovic Date: Sat, 29 Oct 2022 15:02:40 +0200 Subject: [PATCH 01/15] Changed port to 8090 --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1960fa73..f620381b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1 @@ -server.port=${PORT} \ No newline at end of file +server.port=8090 From 309a84d1cd80330578c17bdb76f4f04821ec0012 Mon Sep 17 00:00:00 2001 From: MilenkoMarkovic Date: Sat, 29 Oct 2022 15:12:40 +0200 Subject: [PATCH 02/15] Added Dockerfile --- Dockerfile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..f987669e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,17 @@ +# AS to name this stage as maven +FROM maven:3.6.3 AS maven + +WORKDIR /usr/src/app +COPY . /usr/src/app +RUN mvn package + +# For Java 8, +FROM adoptopenjdk/openjdk8:alpine-jre + +ARG JAR_FILE=praksa2022.jar + +WORKDIR /opt/app + +COPY --from=maven /usr/src/app/target/${JAR_FILE} /opt/app/ + +ENTRYPOINT ["java","-jar","spring-boot-api-tutorial.jar"] From 5fddbcc8f41a9fbe65c47bd6210cabe1ea519ca4 Mon Sep 17 00:00:00 2001 From: MilenkoMarkovic Date: Sat, 29 Oct 2022 15:34:36 +0200 Subject: [PATCH 03/15] Changed Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f987669e..639fd9c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,4 +14,4 @@ WORKDIR /opt/app COPY --from=maven /usr/src/app/target/${JAR_FILE} /opt/app/ -ENTRYPOINT ["java","-jar","spring-boot-api-tutorial.jar"] +ENTRYPOINT ["java","-jar","praksa2022.jar"] From d214f2bb9f340418cece72f8d6cb9f11fb6c54ff Mon Sep 17 00:00:00 2001 From: Milenko Date: Sun, 30 Oct 2022 08:25:48 +0100 Subject: [PATCH 04/15] Update Dockerfile Maven changed to 3.3.9(Heroku issue) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 639fd9c4..d4ce67ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # AS to name this stage as maven -FROM maven:3.6.3 AS maven +FROM maven:3.3.9 AS maven WORKDIR /usr/src/app COPY . /usr/src/app From f245a7ee0bdfb89401cfcab65da553afecdfe996 Mon Sep 17 00:00:00 2001 From: MilenkoMarkovic Date: Sun, 30 Oct 2022 09:38:21 +0100 Subject: [PATCH 05/15] Add heroku.yml --- heroku.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 heroku.yml diff --git a/heroku.yml b/heroku.yml new file mode 100644 index 00000000..8eec25b9 --- /dev/null +++ b/heroku.yml @@ -0,0 +1,3 @@ +build: + docker: + web: Dockerfile From 52a9c36318234622768c04472872c048554f05f7 Mon Sep 17 00:00:00 2001 From: MilenkoMarkovic Date: Sun, 30 Oct 2022 09:42:16 +0100 Subject: [PATCH 06/15] Cmd instead ENTRYPOINT --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d4ce67ab..a115897b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,4 +14,4 @@ WORKDIR /opt/app COPY --from=maven /usr/src/app/target/${JAR_FILE} /opt/app/ -ENTRYPOINT ["java","-jar","praksa2022.jar"] +CMD ["java","-jar","praksa2022.jar"] From 091926b2cd8027957fc327295139077123dfeff4 Mon Sep 17 00:00:00 2001 From: MilenkoMarkovic Date: Fri, 6 Jan 2023 08:42:30 +0100 Subject: [PATCH 07/15] added src/bin --- .../api/praksa2022/Praksa2022Application.class | Bin 0 -> 847 bytes .../praksa2022/Praksa2022ApplicationTests.class | Bin 0 -> 846 bytes .../praksa2022/controller/DemoController.class | Bin 0 -> 1240 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/bin/intens/api/praksa2022/Praksa2022Application.class create mode 100644 src/bin/intens/api/praksa2022/Praksa2022ApplicationTests.class create mode 100644 src/bin/intens/api/praksa2022/controller/DemoController.class diff --git a/src/bin/intens/api/praksa2022/Praksa2022Application.class b/src/bin/intens/api/praksa2022/Praksa2022Application.class new file mode 100644 index 0000000000000000000000000000000000000000..c511e446665a2a818be9085951a811db8c29dc5a GIT binary patch literal 847 zcmbVK!EO^V5Pc45lPrOhKwD@p<`zJ7QN)P=QbB-_B0!{6LY$nfNvGYlEw2;Ammz@! zcRqs;L5#PBg0!kCE@RL5&9mOT`Tq0sR{#&N*+N6$7MY+;nJP!A^Xjlv!#l%a`s&Yh z+qs-F708+vngS~aYN66xnOXXBdZ4o)uza5kg@*#?1~+yEnvdP8m(JU1u8Z=XOgcOJT2kSx57PSCR_Q#M*?X@F{lWS}nJHsz zkW(#xGyPY~q@sOfZTL%M4Y>?fDj7aHopg?RPRAz++PKig5-tj?4#p=_n1m=~6sOc1 zlhH5c#Z>zp#li*pW1FdbS9yy0aj_ZpsT8=)=rj8?Vh;*MMqq95uI~3X)&!oN?nAWU zOkxF+iJkjQKc%Q*qjq(+;tT{fU(ZdTLO(YPDv4EYM*b-){zmegLjLU7HIHo z3CkQ?oZaQB;4}Gx_S=5)3EgiMrpGa2!0#&@yGJNoLZ7n^F5}8E!_9vfR%;lNilM=M P4Xju3Dz5Pv`8R-HjuPvw literal 0 HcmV?d00001 diff --git a/src/bin/intens/api/praksa2022/Praksa2022ApplicationTests.class b/src/bin/intens/api/praksa2022/Praksa2022ApplicationTests.class new file mode 100644 index 0000000000000000000000000000000000000000..78c995a20d3357da9ee4f70c902089654eff8dea GIT binary patch literal 846 zcmb7CO>Yx15Pe?Kd@O;qf%4S@K9)U7t(Y$w1kLjnoz z9Qa9y@dB+-0~H6`GoClko;UOL`^V1!?qjQkgke|dAhpkgRhf0-*o(pLV355$G54)4 zRUv{hdMthLEi@R`=VB?cQs`OsVltOSU})Y`T7?G;7q;&lFf<;SscfOc&^yIGan86l zE;4+3t)29yT*@ggOl4JBzrd|ClTucGkEfmSk>skf#szNNY-he8eqIQzP2dyBf9Ib8 zdh3*)9Xe6Tx5gc>Oc~XfhsK0h)Cvd>h6^6vTS@%qLQ=GGsf#sSX4u@$Pb(gU_?KZ+ zq?ao#pD(J3bYnq9GW2s(i1I)<75!hAjc}wq!+_BL*O(zgw=k6SF62f`iDT>4LI+jJ zXL_l;q9^vFcD2wHZRWAAVH?*O9{;-?bvMoxfgv54g)8J!6|1}b_ZixW0?`!Zf3{%= z4w@gDP9UMRh9>zfvhLC?qci=4_M3kC0o^Y(rbm0kfa2@4cYmU=fj)V_6^bUfN>)T| Y(s`Ec+6uPL3bq6{C_ll?6TVx(4?nNsUH||9 literal 0 HcmV?d00001 diff --git a/src/bin/intens/api/praksa2022/controller/DemoController.class b/src/bin/intens/api/praksa2022/controller/DemoController.class new file mode 100644 index 0000000000000000000000000000000000000000..9f06cab3dc0a94f59a52444a1899e9329d440d96 GIT binary patch literal 1240 zcmcgsU279T6upxsO|p$mj8?&-omPx)GCi4mt(bho=* zKhVk<9YtvTXBg|fUuG4`3|c2*BK%0G(0?^P!N4(C+>uJUT?PxC%|iy|J$-~#s55BJ zu=~bnQ-dYO@U=2%bu_^v9_Tock#JHgo)|rjFt(4mS05cCmvN$vCUeT z_B^P;wFXpRnZZh@KO4l*WxecWgKGAr!k1}0Ml%xBdj{>k4n%Y)jLhsGFU#&&S_TgZ z{ZDe~F<1)G4YYQdj)=Xp*{251l}V8LP=-pl)KK^bmjFALGv6hr)j>*ait&Y-NGmDT zr@isTy}A*}DOaI4)Ts&Z zxy*)kBY#V`vRPj=VP31fDy%bD&i9`|<3L(Vg2+NxSO>bq^oIZ_(WwH9v{uP_L~j}G z-Y2NNX?q`_@nwo>(wbp_zPD&?T%h1Ow8^5>;3hGx(76P+3YhK`Fx3l~7U1rb;~w0m OJ&U+T`vyH_I`i)WW^eug literal 0 HcmV?d00001 From d0d733760fdeba91a835b5f373f5fca6cca5e937 Mon Sep 17 00:00:00 2001 From: MilenkoMarkovic Date: Fri, 6 Jan 2023 15:41:41 +0100 Subject: [PATCH 08/15] added Dockerfile --- Dockerfile | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index a115897b..02a67054 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,7 @@ -# AS to name this stage as maven -FROM maven:3.3.9 AS maven - -WORKDIR /usr/src/app -COPY . /usr/src/app -RUN mvn package - -# For Java 8, -FROM adoptopenjdk/openjdk8:alpine-jre - -ARG JAR_FILE=praksa2022.jar +FROM openjdk:8-jdk-alpine WORKDIR /opt/app -COPY --from=maven /usr/src/app/target/${JAR_FILE} /opt/app/ +COPY target/praksa2022-0.0.1-SNAPSHOT.jar /opt/app/ -CMD ["java","-jar","praksa2022.jar"] +CMD ["java","-jar","praksa2022-0.0.1-SNAPSHOT.jar"] From 6d8b5f72ae10ca5012b0e04ad7851096667ed3e5 Mon Sep 17 00:00:00 2001 From: MilenkoMarkovic Date: Sat, 7 Jan 2023 07:31:38 +0100 Subject: [PATCH 09/15] changed Dockerfile --- Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 02a67054..2fcb739c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ FROM openjdk:8-jdk-alpine - -WORKDIR /opt/app - -COPY target/praksa2022-0.0.1-SNAPSHOT.jar /opt/app/ - -CMD ["java","-jar","praksa2022-0.0.1-SNAPSHOT.jar"] +RUN addgroup -S miki && adduser -S miki -G miki +USER miki:miki +ARG JAR_FILE=target/*.jar +COPY ${JAR_FILE} app.jar +ENTRYPOINT ["java","-jar","/app.jar"] From e739c21493209bb3d4304874b8543d65da00e5da Mon Sep 17 00:00:00 2001 From: MilenkoMarkovic Date: Sat, 7 Jan 2023 09:20:56 +0100 Subject: [PATCH 10/15] added test script --- .github/workflows/test.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 00000000..f1476ce5 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,23 @@ +on: + pull_request: + branches: master +jobs: + test: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: + uses: actions/setup-java@v3 + with: + java-version: 8 + distribution: 'adopt-openj9' + + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.8.2 + + - name: Tests + run: mvn clean install From 9e43161bccf91fa9e65a1bd314a53d135a5cbd7d Mon Sep 17 00:00:00 2001 From: Milenko Date: Sat, 7 Jan 2023 12:12:12 +0100 Subject: [PATCH 11/15] Update heroku.yml --- heroku.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/heroku.yml b/heroku.yml index 8eec25b9..174a8037 100644 --- a/heroku.yml +++ b/heroku.yml @@ -1,3 +1,5 @@ build: docker: web: Dockerfile + server: + port: ${PORT:8090} From 269373b0943fe9df8f0ef808ca925e6875610c83 Mon Sep 17 00:00:00 2001 From: MilenkoMarkovic Date: Sat, 7 Jan 2023 13:09:32 +0100 Subject: [PATCH 12/15] changed yaml files,akhileshns/heroku-deploy added --- .github/workflows/deploy.yml | 22 ++++++++++++++++++++++ .github/workflows/test.yml | 5 ++--- 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 00000000..3bbb9a1f --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,22 @@ +name: Deployment +on: + push: + branches: + - master +jobs: + build: + name: Build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: '8' + - name: Build with Maven + run: mvn -B package -DskipTests --file pom.xml + - uses: akhileshns/heroku-deploy@v3.12.12 + with: + heroku_api_key: ${{secrets.HEROKU_API_KEY}} + heroku_app_name: ${{secrets.HEROKU_APP_NAME}} + heroku_email: "milenko.markovic@gmail.com" \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f1476ce5..3c1aa633 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,13 +6,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v1 - name: - uses: actions/setup-java@v3 + uses: actions/setup-java@v1 with: java-version: 8 - distribution: 'adopt-openj9' - name: Setup Maven uses: stCarolas/setup-maven@v4.5 From b45341b7c9d8f7d56a1cab893017c8c3251a70ca Mon Sep 17 00:00:00 2001 From: MilenkoMarkovic Date: Sat, 7 Jan 2023 13:24:48 +0100 Subject: [PATCH 13/15] modified deploy.myl --- .github/workflows/deploy.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3bbb9a1f..2c676e14 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,4 +1,8 @@ name: Deployment + +env: + HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }} + HEROKU_APP_NAME: ${{ secrets.HEROKU_APP_NAME }} on: push: branches: @@ -15,8 +19,9 @@ jobs: java-version: '8' - name: Build with Maven run: mvn -B package -DskipTests --file pom.xml - - uses: akhileshns/heroku-deploy@v3.12.12 - with: - heroku_api_key: ${{secrets.HEROKU_API_KEY}} - heroku_app_name: ${{secrets.HEROKU_APP_NAME}} - heroku_email: "milenko.markovic@gmail.com" \ No newline at end of file + - uses: Heroku Container Registry login + run: heroku container:login + - uses: Build and push + run: heroku container:push -a $HEROKU_API_KEY web + - uses: Release + run: heroku container:release -a $HEROKU_APP_NAME web From e16bde74da580b9d87986dcd912d04efd222981d Mon Sep 17 00:00:00 2001 From: MilenkoMarkovic Date: Sat, 7 Jan 2023 13:28:31 +0100 Subject: [PATCH 14/15] modified deploy yaml --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2c676e14..ec2a5bf6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,9 +19,9 @@ jobs: java-version: '8' - name: Build with Maven run: mvn -B package -DskipTests --file pom.xml - - uses: Heroku Container Registry login + - name: Heroku Container Registry login run: heroku container:login - - uses: Build and push + - name: Build and push run: heroku container:push -a $HEROKU_API_KEY web - - uses: Release + - name: Release run: heroku container:release -a $HEROKU_APP_NAME web From f72211f0a92db51a7f1c76df4925de832a308c31 Mon Sep 17 00:00:00 2001 From: MilenkoMarkovic Date: Sat, 7 Jan 2023 13:42:20 +0100 Subject: [PATCH 15/15] check new push --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 2fcb739c..13208cec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ +#check user miki FROM openjdk:8-jdk-alpine RUN addgroup -S miki && adduser -S miki -G miki USER miki:miki