Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
1f38825
[IM-4] remove almost all foreign keys and find other anomalies in mig…
aldeeyar Nov 10, 2022
879b28b
[IM-4] remove config from acitivities-collector migrations
aldeeyar Nov 17, 2022
b89785c
add dockerfile for postgres and fix auth, config, rest modules
aldeeyar Mar 2, 2023
44c4ec3
add dockerfile for postgres
aldeeyar Mar 2, 2023
079d8aa
add other fixes to run all major services
aldeeyar Mar 5, 2023
050bb43
Merge pull request #1 from aldeeyar/feature/local-run
aldeezer Mar 5, 2023
40ac705
add test workflow
aldeeyar Mar 12, 2023
31d5155
add sonar cloud
aldeeyar Mar 12, 2023
bc50e7f
fix sonar
aldeeyar Mar 12, 2023
fb709e9
fix sonar
aldeeyar Mar 12, 2023
943b2c4
fix sonar
aldeeyar Mar 12, 2023
7d76957
fix sonar
aldeeyar Mar 12, 2023
4e29e90
add .mvn
aldeeyar Mar 12, 2023
aaa247d
fix workflow
aldeeyar Mar 12, 2023
43fb79b
directory fix
aldeeyar Mar 12, 2023
0f6b841
remove unneccessary test
aldeeyar Mar 12, 2023
9316e72
remove tests
aldeeyar Mar 12, 2023
0f2dfd6
add eureka docker push
aldeeyar Mar 13, 2023
95ad4c7
add other workflow
aldeeyar Mar 13, 2023
5e578d8
fix docker workflow
aldeeyar Mar 13, 2023
e9d6ba1
fix workflow
aldeeyar Mar 13, 2023
5e4f60b
fix workflow
aldeeyar Mar 13, 2023
7cd61f3
fix workflow
aldeeyar Mar 13, 2023
15ee929
fix workflow
aldeeyar Mar 13, 2023
2908e05
fix workflow
aldeeyar Mar 13, 2023
82d3c08
fix workflow
aldeeyar Mar 13, 2023
8b0e3b4
fix workflow
aldeeyar Mar 13, 2023
38e826e
add other builds
aldeeyar Mar 13, 2023
1726c3f
fix jar file name
aldeeyar Mar 13, 2023
c8588bf
fix jar file name
aldeeyar Mar 13, 2023
a16403f
fix profiles
aldeeyar Mar 13, 2023
e8c3794
add agents gateway
aldeeyar Mar 31, 2023
8bc27ba
add agents gateway
aldeeyar Mar 31, 2023
7f7582d
add agents gateway
aldeeyar Mar 31, 2023
31f3f24
add agents gateway
aldeeyar Mar 31, 2023
a8b8cd3
add agents gateway
aldeeyar Mar 31, 2023
3bb75db
add agents gateway
aldeeyar Mar 31, 2023
a7eab0e
add agents gateway
aldeeyar Apr 1, 2023
390c9e9
add agents gateway
aldeeyar Apr 1, 2023
a658bff
add agents gateway
aldeeyar Apr 1, 2023
295150d
change ip of database
aldeeyar Apr 10, 2023
d5c8631
change ip of database
aldeeyar Apr 10, 2023
1cb2a65
change ip of database
aldeeyar Apr 10, 2023
fb8ef71
change ip of database
aldeeyar Apr 10, 2023
e0d7211
change ip of database
aldeeyar Apr 10, 2023
ce21f15
change ip of database
aldeeyar Apr 10, 2023
ecead82
change ip of database
aldeeyar Apr 10, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 80 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
name: SonarCloud
on:
push:
branches:
- master
pull_request:
types: [opened, synchronize, reopened]
jobs:
build:
name: Build and analyze
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: 11
distribution: 'zulu' # Alternative distribution options are available.
- name: Cache SonarCloud packages
uses: actions/cache@v3
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: /[Eureka/]Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_EUREKA }}
working-directory: ./eureka-server
run: |
chmod +x mvnw
./mvnw -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=innometrics-eureka
- name: /[Auth/]Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_AUTH }}
run: |
chmod +x mvnw
./mvnw -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=innometrics-auth
working-directory: ./auth-server
- name: /[Config/]Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_CONFIG }}
working-directory: ./config-service
run: |
chmod +x mvnw
./mvnw -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=innometrics-config
- name: /[Collector/]Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_COLLECTOR }}
working-directory: ./activities-collector
run: |
chmod +x mvnw
./mvnw -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=innometrics-collector
- name: /[API/]Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_API }}
working-directory: ./InnoMetrics-RestAPI
run: |
chmod +x mvnw
./mvnw -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=innometrics-api
- name: /[Agent/]Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_API }}
working-directory: ./agents-gateway
run: |
chmod +x mvnw
./mvnw -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=agents-gateway
137 changes: 137 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
name: Publish Docker Image

env:
EUREKA_IMAGE: aldeeyar/innometrics-eureka:${{ github.sha }}
AUTH_IMAGE: aldeeyar/innometrics-auth:${{ github.sha }}
CONFIG_IMAGE: aldeeyar/innometrics-config:${{ github.sha }}
COLLECTOR_IMAGE: aldeeyar/innometrics-collector:${{ github.sha }}
API_IMAGE: aldeeyar/innometrics-api:${{ github.sha }}
AGENTS_IMAGE: aldeeyar/innometrics-agents:${{ github.sha }}

on:
push:
branches:
- 'master'
- 'ci'

jobs:
push_to_registry:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3

- name: Set up JDK 8
uses: actions/setup-java@v3
with:
java-version: 8
distribution: 'zulu' # Alternative distribution options are available.

- name: Log in to Docker Hub
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
username: ${{ secrets.USERNAME }}
password: ${{ secrets.PASSWORD }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: aldeeyar/innometrics-eureka

- name: /[Eureka/] Build JAR file
working-directory: ./eureka-server
run: |
chmod +x mvnw
./mvnw clean install

- name: /[Auth/] Build JAR file
working-directory: ./auth-server
run: |
chmod +x mvnw
./mvnw clean install

- name: /[Config/] Build JAR file
working-directory: ./config-service
run: |
chmod +x mvnw
./mvnw clean install

- name: /[Collector/] Build JAR file
working-directory: ./activities-collector
run: |
chmod +x mvnw
./mvnw clean install

- name: /[API/] Build JAR file
working-directory: ./InnoMetrics-RestAPI
run: |
chmod +x mvnw
./mvnw clean install

- name: /[Agents/] Build JAR file
working-directory: ./agents-gateway
run: |
chmod +x mvnw
./mvnw clean install

- name: /[Eureka/] Push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
file: ./eureka-server/Dockerfile
push: true
tags: ${{ env.EUREKA_IMAGE }}
build-args: |
JAR_FILE=./eureka-server/target/innometrics-eureka-server.jar

- name: /[Auth/] Push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
file: ./auth-server/Dockerfile
push: true
tags: ${{ env.AUTH_IMAGE }}
build-args: |
JAR_FILE=./auth-server/target/innometrics-auth-server.jar

- name: /[Config/] Push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
file: ./config-service/Dockerfile
push: true
tags: ${{ env.CONFIG_IMAGE }}
build-args: |
JAR_FILE=./config-service/target/innometrics-config-service.jar

- name: /[Collector/] Push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
file: ./activities-collector/Dockerfile
push: true
tags: ${{ env.COLLECTOR_IMAGE }}
build-args: |
JAR_FILE=./activities-collector/target/InnoMetrics-Collector-Server.jar

- name: /[API/] Push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
file: ./InnoMetrics-RestAPI/Dockerfile
push: true
tags: ${{ env.API_IMAGE }}
build-args: |
JAR_FILE=./InnoMetrics-RestAPI/target/InnoMetrics-RestAPI.jar

- name: /[Agents/] Push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
file: ./agents-gateway/Dockerfile
push: true
tags: ${{ env.AGENTS_IMAGE }}
build-args: |
JAR_FILE=./agents-gateway/target/InnoMetrics-Agents-gateway.jar
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM postgres:15-alpine
EXPOSE 5432:5432
ENV POSTGRES_PASSWORD=password
5 changes: 3 additions & 2 deletions InnoMetrics-RestAPI/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM openjdk:8
ADD InnoMetrics-RestAPI.jar InnoMetrics-RestAPI.jar
ARG JAR_FILE
ADD $JAR_FILE InnoMetrics-RestAPI.jar
EXPOSE 9091
ENTRYPOINT ["java", "-jar", "InnoMetrics-RestAPI.jar", "--spring.profiles.active=qa"]
ENTRYPOINT ["java", "-jar", "InnoMetrics-RestAPI.jar", "--spring.profiles.active=prod"]
2 changes: 2 additions & 0 deletions InnoMetrics-RestAPI/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

<properties>
<java.version>1.8</java.version>
<sonar.organization>aldeeyar</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<!--spring-cloud.version>Hoxton.RC2</spring-cloud.version-->
</properties>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
#spring.datasource.password = postgres
#eureka.instance.ip-address=127.0.0.1
eureka.client.serviceUrl.defaultZone= http://localhost:8761/eureka/
spring.datasource.url = jdbc:postgresql://10.90.138.244:5432/postgres
spring.datasource.password = 1nn0M3tr1c5
spring.datasource.url = jdbc:postgresql://localhost:5432/postgres
spring.datasource.password = password
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
security.require-ssl=true
server.ssl.key-store=/etc/Certificates/keystore.p12
server.ssl.key-store-password= InnoMetrics
server.ssl.keyStoreType= PKCS12
server.ssl.keyAlias= tomcat
eureka.client.serviceUrl.defaultZone= http://innometrics-eureka-server:8761/eureka/
spring.datasource.url = jdbc:postgresql://InnoMetricsDB:5432/
spring.datasource.password = 1nn0M3tr1c5
# security.require-ssl=true
# server.ssl.key-store=/etc/Certificates/keystore.p12
# server.ssl.key-store-password= InnoMetrics
# server.ssl.keyStoreType= PKCS12
# server.ssl.keyAlias= tomcat
eureka.client.serviceUrl.defaultZone= http://localhost:8761/eureka/
spring.datasource.url = jdbc:postgresql://84.201.133.60:5432/postgres
spring.datasource.password = password
Loading