Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge branch 'dev' into staging #780

Merged
merged 67 commits into from
Aug 13, 2024
Merged

Merge branch 'dev' into staging #780

merged 67 commits into from
Aug 13, 2024

Conversation

Homoakin619
Copy link
Contributor

No description provided.

King-Mikaelson and others added 30 commits August 12, 2024 10:29
@King-Mikaelson
fix(profile-pic): implemented fix for profile picture
1266314
@King-Mikaelson
fix(profile-pic): implemented fix for profile picture
68f7df1
@ThePrimeJnr
ci: improve base compose.yaml
9beed1d
@ThePrimeJnr
ci(compose): fix volume mapping
8734b59
@ThePrimeJnr
ci: added nginx.conf -few mods too
64dd380
@ThePrimeJnr
ci: add postgres enviroment and depend on app health
7a6dd5c
@ThePrimeJnr
chore: uer DB_NAME in place of DB_DATABASE
7c65032
@ThePrimeJnr
fix: invalid tag in node image
f0b6545
ci: improve healthchecks, expose nginx - be careful with docker volumes
1079926
ci: set all environemnt compose
54facce
@Homoakin619
ci: update ci workflow
4317554
ci: resolve app hostname with docker dns
85e45f4
@ThePrimeJnr
Update dev.yml
77f5227
@ThePrimeJnr
Create deploy.sh
ec82781
@ThePrimeJnr
Rename .github/workflows/deploy.sh to deploy.sh
cd10811
@ThePrimeJnr
Create compose.green.yaml
c7fbda4
@ThePrimeJnr
Update deploy.sh
b607a0d
@ThePrimeJnr
Create nginx-green.conf
c258eac
@ThePrimeJnr
Update nginx.conf
5c5e6a1
@ThePrimeJnr
Update deploy.sh
bea9214
@ThePrimeJnr
Rename compose.green.yaml to compose/compose.green.yaml
7e258db
@ThePrimeJnr
Rename compose.dev.yaml to compose/compose.dev.yaml
2ee9b87
@ThePrimeJnr
Rename compose.prod.yaml to compose/compose.prod.yaml
05837cd
@ThePrimeJnr
Rename compose.staging.yaml to compose/compose.staging.yaml
e0e2127
@ThePrimeJnr
Rename nginx.conf to nginx/nginx.conf
18abc48
@ThePrimeJnr
Rename nginx-green.conf to nginx/nginx-green.conf
42de53b
@ThePrimeJnr
Delete wiki_readme directory
5e31bcb
@ThePrimeJnr
Delete dora directory
652193c
@ThePrimeJnr
Update compose.yaml
5874ae0
@ThePrimeJnr
Update compose.green.yaml
fe9952e
ThePrimeJnr and others added 29 commits August 12, 2024 18:23
@ThePrimeJnr
Update and rename prdeploy.yml to pr-deploy.yml
ec6e339
@ThePrimeJnr
Rename pr-deploy.yml to pr-deploy.yaml
52cf3f3
@ThePrimeJnr
Update .dockerignore
0b4bc4e
@Homoakin619
Merge pull request #773 from hngprojects/ci/refactor
ecc174d 
ci: improve base compose.yaml
@ThePrimeJnr
ci: fix deployment dir
a7e08df
@Homoakin619
Merge pull request #774 from hngprojects/ci/fix
83d6bca 
ci: fix deployment dir
@ThePrimeJnr
Update nginx.conf
25244fa
@ThePrimeJnr
Rename nginx-green.conf to nginx.green.conf
69a7584
@ThePrimeJnr
Rename nginx.green.conf to nginx-green.conf
a7c9f22
@Homoakin619
Merge pull request #775 from hngprojects/destinedcodes-patch-1
5b2f260 
Update nginx.conf
@ThePrimeJnr
Update data-source.ts
95a05e5
@Homoakin619
Merge pull request #776 from hngprojects/destinedcodes-patch-2
6556ce3 
Update data-source.ts
@ThePrimeJnr
ci: recreate nginx only after haelthcheck
4a84303
@Homoakin619
Merge pull request #777 from hngprojects/ci/fix
b91fd76 
ci: recreate nginx only after haelthcheck
@ThePrimeJnr
Update data-source.ts
d62faa4
@Homoakin619
Merge pull request #778 from hngprojects/destinedcodes-patch-3
a6376a9 
Update data-source.ts
@King-Mikaelson
fix(profile-pic): implemented fix for profile picture
96d52e3
@King-Mikaelson
fix(profile-pic): implemented fix for profile picture
6c36a05
@King-Mikaelson
fix(profile-pic): implemented fix for profile picture
956ffd1
@King-Mikaelson
fix(profile-pic): implemented fix for profile picture
23ea23e
@King-Mikaelson
fix(profile-pic): implemented fix for profile picture
a6aca11
@King-Mikaelson
fix(profile-pic): implemented fix for profile picture
58f332f
@King-Mikaelson
fix(profile-pic): implemented fix for profile picture
537e64b
@King-Mikaelson
fix(profile-pic): implemented fix for profile picture
e71b9df
@King-Mikaelson
fix(profile-pic): implemented fix for profile picture
b583bc3
@King-Mikaelson
fix(profile-pic): implemented fix for profile picture
7c1e894
@Homoakin619
Merge pull request #772 from King-Mikaelson/feat/profile-pic
5f8904f 
fix:upload profile pic
@King-Mikaelson
fix(profile-pic): implemented fix for profile picture
9343ca6
@Homoakin619
Merge pull request #779 from King-Mikaelson/feat/profile-pic
d911100 
fix: implemented fix for profile picture
@Homoakin619 Homoakin619 merged commit 00e998b into staging Aug 13, 2024
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Homoakin619 @King-Mikaelson @ThePrimeJnr