From 978908c4bc9bc11df05428bdff8b82e18a070071 Mon Sep 17 00:00:00 2001 From: kiyansh0812 <114618468+kiyansh0812@users.noreply.github.com> Date: Mon, 3 Oct 2022 20:42:59 +0530 Subject: [PATCH 1/9] Update maven.yml --- .github/workflows/maven.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 82af4a9..b294462 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -16,10 +16,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 + - name: Set up JDK latest uses: actions/setup-java@v1 with: - java-version: '1.8' + java-version: latest distribution: 'adopt' cache: maven - name: Build with Maven @@ -33,4 +33,4 @@ jobs: registry: docker.io dockerfile: Dockerfile username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} \ No newline at end of file + password: ${{ secrets.DOCKER_PASSWORD }} From 8bdef67774e62319fcc865ad2ff52d8b88e4f35e Mon Sep 17 00:00:00 2001 From: kiyansh0812 <114618468+kiyansh0812@users.noreply.github.com> Date: Mon, 3 Oct 2022 21:06:15 +0530 Subject: [PATCH 2/9] Update maven.yml --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b294462..b184b0e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -16,10 +16,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK latest + - name: Set up JDK 1.8 uses: actions/setup-java@v1 with: - java-version: latest + java-version: '1.8' distribution: 'adopt' cache: maven - name: Build with Maven From 24b6ee3b5113fb4e84cec51c83fe61f55938b02f Mon Sep 17 00:00:00 2001 From: kiyansh0812 Date: Tue, 4 Oct 2022 00:13:52 +0530 Subject: [PATCH 3/9] mvn build commit --- .github/workflows/maven.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 82af4a9..f9f8e46 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -25,12 +25,12 @@ jobs: - name: Build with Maven run: mvn clean install - - name: Build & push Docker image - uses: mr-smithers-excellent/docker-build-push@v5 - with: - image: javatechie/springboot-images-new - tags: latest - registry: docker.io - dockerfile: Dockerfile - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} \ No newline at end of file + # - name: Build & push Docker image + # uses: mr-smithers-excellent/docker-build-push@v5 + # with: + # image: javatechie/springboot-images-new + # tags: latest + # registry: docker.io + # dockerfile: Dockerfile + # username: ${{ secrets.DOCKER_USERNAME }} + # password: ${{ secrets.DOCKER_PASSWORD }} \ No newline at end of file From 68170d35f339a48d66240b3c42f36f8c5e2569ad Mon Sep 17 00:00:00 2001 From: kiyansh0812 Date: Tue, 4 Oct 2022 01:02:21 +0530 Subject: [PATCH 4/9] unwanted lines are commented --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index da6e977..bca42bc 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -25,7 +25,7 @@ jobs: - name: Build with Maven run: mvn clean install -<<<<<<< HEAD +#<<<<<<< HEAD # - name: Build & push Docker image # uses: mr-smithers-excellent/docker-build-push@v5 # with: From d7a8b0b46b4ad2a153af5f5209bb7a272f933f21 Mon Sep 17 00:00:00 2001 From: kiyansh0812 Date: Tue, 4 Oct 2022 01:04:32 +0530 Subject: [PATCH 5/9] commented the docker hub lines --- .github/workflows/maven.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index bca42bc..74a084e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,14 +35,14 @@ jobs: # dockerfile: Dockerfile # username: ${{ secrets.DOCKER_USERNAME }} # password: ${{ secrets.DOCKER_PASSWORD }} -======= - - name: Build & push Docker image - uses: mr-smithers-excellent/docker-build-push@v5 - with: - image: javatechie/springboot-images-new - tags: latest - registry: docker.io - dockerfile: Dockerfile - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} ->>>>>>> 8bdef67774e62319fcc865ad2ff52d8b88e4f35e +# ======= +# - name: Build & push Docker image +# uses: mr-smithers-excellent/docker-build-push@v5 +# with: +# image: javatechie/springboot-images-new +# tags: latest +# registry: docker.io +# dockerfile: Dockerfile +# username: ${{ secrets.DOCKER_USERNAME }} +# password: ${{ secrets.DOCKER_PASSWORD }} +# >>>>>>> 8bdef67774e62319fcc865ad2ff52d8b88e4f35e From 5e8e40703ff61aec6109518290458636d51f6bbe Mon Sep 17 00:00:00 2001 From: kiyansh0812 Date: Tue, 4 Oct 2022 01:11:21 +0530 Subject: [PATCH 6/9] text commit --- .github/workflows/maven.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 74a084e..30b1068 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -46,3 +46,4 @@ jobs: # username: ${{ secrets.DOCKER_USERNAME }} # password: ${{ secrets.DOCKER_PASSWORD }} # >>>>>>> 8bdef67774e62319fcc865ad2ff52d8b88e4f35e +#commented line From 94d7e0b412fe230bcfb8b50d3d8e7c8bc2a198d4 Mon Sep 17 00:00:00 2001 From: kiyansh0812 Date: Tue, 4 Oct 2022 01:33:22 +0530 Subject: [PATCH 7/9] docker config --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f7cd959..aa7539c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM openjdk:8 EXPOSE 8080 -ADD target/springboot-images-new.jar springboot-images-new.jar +ADD target/springboot-autoimage.jar springboot-autoimage.jar ENTRYPOINT ["java","-jar","/springboot-images-new.jar"] \ No newline at end of file From f32d5dc960d6a1f51f574aad68c0901a0ca02d2c Mon Sep 17 00:00:00 2001 From: kiyansh0812 Date: Tue, 4 Oct 2022 01:35:44 +0530 Subject: [PATCH 8/9] pom commit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7a3c888..155ed23 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ spring-boot-maven-plugin - springboot-images-new + springboot-autoimage From c575d7a1770f33988af2bdfa960a543c8401db88 Mon Sep 17 00:00:00 2001 From: kiyansh0812 Date: Tue, 4 Oct 2022 01:37:42 +0530 Subject: [PATCH 9/9] Final build for the docker image --- .github/workflows/maven.yml | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 30b1068..91086a6 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -24,26 +24,12 @@ jobs: cache: maven - name: Build with Maven run: mvn clean install - -#<<<<<<< HEAD - # - name: Build & push Docker image - # uses: mr-smithers-excellent/docker-build-push@v5 - # with: - # image: javatechie/springboot-images-new - # tags: latest - # registry: docker.io - # dockerfile: Dockerfile - # username: ${{ secrets.DOCKER_USERNAME }} - # password: ${{ secrets.DOCKER_PASSWORD }} -# ======= -# - name: Build & push Docker image -# uses: mr-smithers-excellent/docker-build-push@v5 -# with: -# image: javatechie/springboot-images-new -# tags: latest -# registry: docker.io -# dockerfile: Dockerfile -# username: ${{ secrets.DOCKER_USERNAME }} -# password: ${{ secrets.DOCKER_PASSWORD }} -# >>>>>>> 8bdef67774e62319fcc865ad2ff52d8b88e4f35e -#commented line + - name: Build & push Docker image + uses: mr-smithers-excellent/docker-build-push@v5 + with: + image: bin4nithu@gmail.com/springboot-autoimage + tags: latest + registry: docker.io + dockerfile: Dockerfile + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} \ No newline at end of file