Skip to content

Commit da8cfc5

Browse files
Merge pull request #9 from brendonmiranda/DJB-2
2 parents 40a455d + bf0caee commit da8cfc5

File tree

10 files changed

+117
-34
lines changed

10 files changed

+117
-34
lines changed

.github/workflows/dozeapp-preprod.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Doze App CD PRE PROD
2+
3+
on:
4+
pull_request:
5+
branches: [ master ]
6+
7+
jobs:
8+
build:
9+
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v2
14+
- name: Set up JDK 13
15+
uses: actions/setup-java@v1
16+
with:
17+
java-version: 13
18+
19+
- name: Grant execute permission for gradlew
20+
run: chmod +x gradlew
21+
22+
- name: Build with Gradle
23+
run: ./gradlew build
24+
25+
- name: Docker Login on DockerHub
26+
run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }}
27+
28+
- name: Docker Publish on DockerHub
29+
run: ./gradlew dockerPushDockerHub
30+
31+
- name: Docker pull published image
32+
run: docker pull evelynvieira/dozeapp:1.0.0
33+
34+
- name: Docker Login on Heroku
35+
run: docker login --username=_ --password=${{ secrets.PREPROD_HEROKU_KEY }} registry.heroku.com
36+
37+
- name: Docker tag on Heroku
38+
run: docker tag evelynvieira/dozeapp:1.0.0 registry.heroku.com/dozeapp-heroku-preprod/worker
39+
40+
- name: Docker push on Heroku
41+
run: docker push registry.heroku.com/dozeapp-heroku-preprod/worker
42+
43+
- name: Heroku auth file
44+
run: echo "${{ secrets.PREPROD_HEROKU_AUTH }}" > ~/.netrc
45+
46+
- name: Heroku container login
47+
run: heroku container:login
48+
49+
- name: Heroku container release
50+
run: heroku container:release worker -a dozeapp-heroku-preprod

.github/workflows/dozeapp-prod.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Doze App CD PROD
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
7+
jobs:
8+
build:
9+
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v2
14+
- name: Set up JDK 13
15+
uses: actions/setup-java@v1
16+
with:
17+
java-version: 13
18+
19+
- name: Grant execute permission for gradlew
20+
run: chmod +x gradlew
21+
22+
- name: Build with Gradle
23+
run: ./gradlew build
24+
25+
- name: Docker Login on DockerHub
26+
run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }}
27+
28+
- name: Docker Publish on DockerHub
29+
run: ./gradlew dockerPushDockerHub
30+
31+
- name: Docker pull published image
32+
run: docker pull evelynvieira/dozeapp:1.0.0
33+
34+
- name: Docker Login on Heroku
35+
run: docker login --username=_ --password=${{ secrets.HEROKU_KEY }} registry.heroku.com
36+
37+
- name: Docker tag on Heroku
38+
run: docker tag evelynvieira/dozeapp:1.0.0 registry.heroku.com/dozeapp-heroku/worker
39+
40+
- name: Docker push on Heroku
41+
run: docker push registry.heroku.com/dozeapp-heroku/worker
42+
43+
- name: Heroku auth file
44+
run: echo "${{ secrets.HEROKU_AUTH }}" > ~/.netrc
45+
46+
- name: Heroku container login
47+
run: heroku container:login
48+
49+
- name: Heroku container release
50+
run: heroku container:release worker -a dozeapp-heroku

.github/workflows/gradle.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ build/
44
!gradle/wrapper/gradle-wrapper.jar
55
!**/src/main/**
66
!**/src/test/**
7+
.env
78

89
### STS ###
910
.apt_generated

Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ ARG JAR_BASE_NAME=${JAR_BASE_NAME}
44
ARG BUILD_VERSION=${BUILD_VERSION}
55
ARG JAR_FILE=$JAR_BASE_NAME-$BUILD_VERSION.jar
66

7+
ARG START_SCRIPT=start.sh
8+
79
COPY ${JAR_FILE} app.jar
8-
ENTRYPOINT ["java","-jar","/app.jar"]
10+
COPY ${START_SCRIPT} start.sh
11+
12+
ENTRYPOINT ["./start.sh"]
913

10-
EXPOSE 8080
14+
CMD ["${BOT_OWNER}", "${BOT_TOKEN}", "${BOT_PREFIX}"]

Procfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ plugins {
1717
apply plugin: 'io.spring.javaformat'
1818

1919
group = 'io.github.brendonmiranda'
20-
version = '0.0.1-SNAPSHOT'
20+
version = '1.0.0'
2121
sourceCompatibility = '13'
2222

2323
configurations {
@@ -49,7 +49,9 @@ dependencies {
4949

5050
docker {
5151
name "${project.group}/${bootJar.baseName}:$project.version"
52+
tag "DockerHub", "evelynvieira/${bootJar.baseName}:$project.version"
5253
copySpec.from("build/libs").into("/")
54+
copySpec.from("start.sh").into("/")
5355
buildArgs([BUILD_VERSION: "$project.version",JAR_BASE_NAME: "${bootJar.baseName}"])
5456
}
5557

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rootProject.name='dozeapp'
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
owner =
2-
token =
3-
prefix =
4-
1+
owner = ${OWNER}
2+
token = ${TOKEN}
3+
prefix = ${PREFIX}

start.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
3+
java -DOWNER=$1 -DTOKEN=$2 -DPREFIX=$3 -jar ./app.jar

0 commit comments

Comments
 (0)