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.

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

Dockerfile/K8s implementation, prod/dev run #24

Merged
merged 3 commits into from
Apr 19, 2021

Conversation

jorgejesus
Copy link
Contributor

⚠️ Before submitting the PR, make sure:

  • yarn test --passWithNoTests

  • Updated mailto for new inbox ([email protected])
  • Dockerfile prepared for K8s
  • New run.sh to kickstart a build process and then yarn start
  • run.sh implements production/develop

Description of the PR

Testing instructions

Run docker container
docker build -t soils-revealed
docker run -p3001:3001 --env-file .env soils-revealed:latest /soils-revealed/run.sh production
set .env variables

What to test? How to do it?

Pivotal Tracker

Link to the task(s), if any

Copy link
Member

@clementprdhomme clementprdhomme left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @jorgejesus,

I left some comments on the PR.

I also wanted to check with you what's the plan with the AWS server. As you can see in .github/workflows/, this repository is still configured to automatically deploy to AWS when commits are pushed to develop and master. This would deploy the staging and production environments. Are those not needed anymore? Is TNC aware of it?

Finally, what will happen with #25? Should we close it?

.env.default Outdated
@@ -1,11 +1,11 @@
PORT=3000
NODE_PORT=3001
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @jorgejesus,

This should be kept as PORT: PORT=3001. The Node.js app uses PORT here and your run.sh script also creates a variable called PORT here.

README.md Outdated
3. Docker build will be initicated.
4. After completed Docker image is stored on a private repository.
5. Image will then be deplyed into the soils-revealed cluster.
6. GKE contains a specific `ConfiMap` with all .env necessary for deployment.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think ConfiMap should be ConfigMap.

@clementprdhomme
Copy link
Member

Bouncing back on one of my previous comments, if we're to work on a new phase of this project, we'd like to keep having a staging environment on your new infrastructure and auto deployment with GitHub Actions, if possible.

We don't need it at this point, but I'd like to make sure this will be possible in the future. Thanks!

@jorgejesus
Copy link
Contributor Author

Hi @clementprdhomme

Thank you for your comments. I have made a new commit implementing PORT instead of NODE_PORT
Concerning the automatic deployment. On my fork I've implemented github app that when you have a push to the repository it automatically builds a docker image and pushes to a dedicate repository from where k8s can pull it. I still have an issue on making k8s recreating the pods when there is a new image/

When you merge into the vizzuality project. We need to have a fast zoom with you, so set up the repository to send the trigger to google cloud build.

@clementprdhomme clementprdhomme merged commit 7be9074 into Vizzuality:develop Apr 19, 2021
@clementprdhomme
Copy link
Member

Thank you Jorge!

jorgejesus added a commit that referenced this pull request Jun 22, 2021
* Dockerfile/K8s implementation, prod/dev run (#24)

* Delete the GitHub Actions

The app will now be built with ISRIC's Google Cloud account

* google search verification file added (#31)

* Modal to recruit user (airtable) (#30)

* Modal to recruit user (airtable)

* airtable: prevent giving a description if 'other' field is not selected

* mobile fixes

* updates in user recruitment  modal

* Updated env variable structure

* cloudbuild configuration - automatic deployment

Co-authored-by: Jorge S. Mendes de Jesus <[email protected]>

* Typo on .dockerignore

* Feat/modal check (#35)

* Modal to recruit user (airtable)

* airtable: prevent giving a description if 'other' field is not selected

* updates in user recruitment  modal

* user modal local storage function

Co-authored-by: Jorge Samuel Mendes de Jesus <[email protected]>
Co-authored-by: Clément Prod'homme <[email protected]>
Co-authored-by: Jorge S. Mendes de Jesus <[email protected]>
jorgejesus added a commit that referenced this pull request Nov 9, 2021
* Dockerfile/K8s implementation, prod/dev run (#24)

* Modal to recruit user (airtable) (#30)

* Modal to recruit user (airtable)

* airtable: prevent giving a description if 'other' field is not selected

* mobile fixes

* updates in user recruitment  modal

* Updated env variable structure

* cloudbuild configuration - automatic deployment

Co-authored-by: Jorge S. Mendes de Jesus <[email protected]>

* Feat/modal check (#35)

* Modal to recruit user (airtable)

* airtable: prevent giving a description if 'other' field is not selected

* updates in user recruitment  modal

* user modal local storage function

* airtable modal removed (#39)

* | missing

* Update docker to bullseye #45

Co-authored-by: Jorge Samuel Mendes de Jesus <[email protected]>
Co-authored-by: Jorge S. Mendes de Jesus <[email protected]>
jorgejesus added a commit that referenced this pull request Nov 30, 2021
* Dockerfile/K8s implementation, prod/dev run (#24)

* Modal to recruit user (airtable) (#30)

* Modal to recruit user (airtable)

* airtable: prevent giving a description if 'other' field is not selected

* mobile fixes

* updates in user recruitment  modal

* Updated env variable structure

* cloudbuild configuration - automatic deployment

Co-authored-by: Jorge S. Mendes de Jesus <[email protected]>

* Feat/modal check (#35)

* Modal to recruit user (airtable)

* airtable: prevent giving a description if 'other' field is not selected

* updates in user recruitment  modal

* user modal local storage function

* airtable modal removed (#39)

* | missing

* Update docker to bullseye #45

* Modal Join us (#44)

* Add 'Join us' modal

* Add action button 'Join us' to top and bottom of Homepage

* Add link 'Join us' in footer menu

Co-authored-by: Jorge Samuel Mendes de Jesus <[email protected]>

Co-authored-by: María Luena Rodríguez <[email protected]>
Co-authored-by: Sidney Gijzen <[email protected]>
jorgejesus added a commit that referenced this pull request Apr 20, 2023
* Dockerfile/K8s implementation, prod/dev run (#24)

* Modal to recruit user (airtable) (#30)

* Modal to recruit user (airtable)

* airtable: prevent giving a description if 'other' field is not selected

* mobile fixes

* updates in user recruitment  modal

* Updated env variable structure

* cloudbuild configuration - automatic deployment

Co-authored-by: Jorge S. Mendes de Jesus <[email protected]>

* Feat/modal check (#35)

* Modal to recruit user (airtable)

* airtable: prevent giving a description if 'other' field is not selected

* updates in user recruitment  modal

* user modal local storage function

* airtable modal removed (#39)

* | missing

* Update docker to bullseye #45

* Modal Join us (#44)

* Add 'Join us' modal

* Add action button 'Join us' to top and bottom of Homepage

* Add link 'Join us' in footer menu

Co-authored-by: Jorge Samuel Mendes de Jesus <[email protected]>

* add Inrae to About Us modal (#59)

* Fix: new cluster name and env for cluster name

* Fix: Possible fix for google clould build variable

* Update: Rool back to fix k8s name

The implementation of google env variable from cloud build is tricky, no time to look into it

* Triggering a google build

---------

Co-authored-by: María Luena Rodríguez <[email protected]>
Co-authored-by: Sidney Gijzen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants