Skip to content

Commit

Permalink
refactored
Browse files Browse the repository at this point in the history
  • Loading branch information
@itszechs
itszechs committed Jun 21, 2024
1 parent 8f83def commit 6c574f4
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 63 deletions.
17 changes: 11 additions & 6 deletions .github/workflows/build-publish.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,19 @@ jobs:
- name: Build with Maven
run: mvn clean package

- name: Build Docker image
run: docker build -t zplex-api .
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Log in to Docker Hub
uses: docker/login-action@v2
- name: Log-in to registry
uses: docker/login-action@v3
with:
registry: https://index.docker.io/v1/
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Push Docker image
run: docker push zplex-api:latest
- name: Build and push container image to registry
uses: docker/build-push-action@v5
with:
context: .
push: true
tags: index.docker.io/${{ secrets.DOCKER_USERNAME }}/zplex-api:${{ github.sha }}
12 changes: 9 additions & 3 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
FROM openjdk:21-jdk-alpine
FROM ubuntu:20.04

ENV TZ=Asia/Kolkata
WORKDIR /app

COPY target/*.jar /app/zplex-api.jar
RUN apt-get update && \
apt-get install -y -q openjdk-21-jdk tzdata && \
ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
echo "${TZ}" > /etc/timezone && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

CMD ["java", "-jar", "/app/zplex-api.jar --server.port=${PORT}"]
COPY target/zplex-api*.jar /app/zplex-api.jar
CMD ["java", "-jar", "/app/zplex-api.jar", "--server.port=${PORT}"]
107 changes: 54 additions & 53 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,59 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>zechs.zplex</groupId>
<artifactId>api</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>zplex-api</name>
<description>REST API for ZPlex</description>
<properties>
<java.version>21</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>zechs.zplex</groupId>
<artifactId>zplex-api</artifactId>
<version>1.0.0</version>
<name>zplex-api</name>
<description>REST API for ZPlex</description>
<properties>
<java.version>21</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<build>
<finalName>${project.artifactId}-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

</project>
2 changes: 1 addition & 1 deletion .../zechs/zplex/api/ZPlexApiApplication.java → .../zplex/zplex_api/ZPlexApiApplication.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package zechs.zplex.api;
package zechs.zplex.zplex_api;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
Expand Down

0 comments on commit 6c574f4

Please sign in to comment.